Merge "Remove old configuration values for demo mode" into oc-dr1-dev