Merge "Enable override of default dynamic config URL" into oc-mr1-dev