OF-98: Applying patch provided by Florian Schmaus - makes Openfire compatible with specs, but also backwards compatible.

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