Merge "Update DynamicConfigPusher to find files using CompatibilityBuildHelper" into oc-dev