Merge pull request #2343 from stewart-ibm/skiboot-v6.1-85-gf83568436527

skiboot v6.1-85-gf83568436527