in the process.  Fixes for upgrades breaking existing configs.


git-svn-id: http://svn.igniterealtime.org/svn/repos/openfire/trunk@9658 b35dd754-fafc-0310-a699-88a17e54d16e