Merge pull request #2669 from stewart-ibm/skiboot-6.2.2

skiboot v6.2.2