Merge pull request #2096 from stewart-ibm/skiboot-v6.0-rc1-31-ga18249182fbe

skiboot v6.0-rc1-31-ga18249182fbe