Migrate Config Options and fix ping watcher

Migrate Config Options to new format during config migration
Ping Watcher wasn't enabled correctly if the default timing had never been updated from default.