Merge pull request #2111 from stewart-ibm/skboot-6.0

skiboot 6.0, linux 4.16.7-openpower2