Also minor cosmetic fix.
More adjustments coming.

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