Merge pull request #2198 from stewart-ibm/skiboot-6.1

skiboot v6.1-rc1