OF-125 Restrict discovery of rooms based on users membership
Merge branch 'master' of https://github.com/igniterealtime/Openfire