Merge pull request #2713 from stewart-ibm/skiboot-6.2.3

2.2.y: skiboot v6.2.3