Merge pull request #3904 from hegdevasant/origin-op-build-1.10.y

skiboot v5.4.12