Merge pull request #4403 from opalci/skiboot-v7.0-12-g17e4ff6bd

skiboot v7.0-12-g17e4ff6bd