Merge "Add new configuration values for demo mode" into oc-dr1-dev