Merge pull request #2453 from stewart-ibm/skiboot-v6.1-188-g606a5a3d44e3

skiboot v6.1-188-g606a5a3d44e3