OF-810 RFC 6121 Routing Compliance Fix
Merge branch 'of810' of https://github.com/sco0ter/Openfire into of810