Merge "Don't overwrite security params when editing saved config" into udc-dev