Merge "Remove .dynamic config from parsing" into oc-dev