Merge pull request #4021 from opalci/skiboot-v6.7-30-g15b93a301

skiboot v6.7-30-g15b93a301