Merge pull request #2418 from stewart-ibm/skiboot-v6.1-163-g4b8cc05a9451

skiboot v6.1-163-g4b8cc05a9451