fix merging of old prefs with new prefs
Merge pull request #3185 from adobe/jasonsanjose/reconcile-prefs

fix merging of old prefs with new prefs