Apply patch we've been carrying in op-build#25

ghost wants to merge 1 commit intoopen-power:masteropen-power/habanero-xml:masterfrom

stewartsmith:apply-op-build-patchstewartsmith/habanero-xml:apply-op-build-patchCopy head branch name to clipboard