Merge pull request #2525 from stewart-ibm/skiboot-v6.2

skiboot v6.2