[oadp-1.5] updates for 1.4 compat#319

openshift-cherrypick-robot wants to merge 5 commits intomigtools:oadp-1.5migtools/oadp-non-admin:oadp-1.5from

openshift-cherrypick-robot:cherry-pick-314-to-oadp-1.5openshift-cherrypick-robot/oadp-non-admin:cherry-pick-314-to-oadp-1.5Copy head branch name to clipboard