Migration will now go ahead and merge in previous system config, even if new plist exists
Migration will now go ahead and merge in previous system config, even if new plist exists

git-svn-id: 81e381228600e5752b80483efd2b45b26c451ea2@9316 e27351fd-9f3e-4f54-a53b-843176b1656c

trevor/calendarserver,trevor/calendarserver,trevor/calendarserver