Merge pull request #4125 from opalci/skiboot-v6.8

skiboot v6.8