Merge pull request #2865 from hegdevasant/origin-op-build-2.2.y

[op-build-2.2.y] skiboot v6.2.4