#1107: Make sure that all settings are preserved upon update.
#1107: Make sure that all settings are preserved upon update.

git-svn-id: efba275c3291004ad656db059d43564e37a1fae9@3647 60fe80c7-c1f8-43be-bd32-c3e8feb7a3b0

dflaven/itop,dflaven/itop,dflaven/itop,dflaven/itop,dflaven/itop