Merge pull request #3284 from opalci/skiboot-v6.5-98-ga0340a09

skiboot v6.5-98-ga0340a09