Merge pull request #2037 from stewart-ibm/skiboot-v5.11-46-g00521231c826

skiboot v5.11-46-g00521231c826