Merge pull request #3502 from opalci/skiboot-v6.5-240-g2700092e

skiboot v6.5-240-g2700092e