Merge "Rename restartOnConfigChanges to recreateOnConfigChanges." into oc-dev