Merge pull request #2077 from stewart-ibm/skiboot-v6.0-rc1

skiboot 6.0-rc1