Fix more config saving options
Merge pull request #1982 from jmullan/feature/fix_more_config_saving

Fix more config saving options
Merge remote-tracking branch 'origin/develop' into feature/autopep8

* origin/develop:
  Fix more config saving options