Fix several refactoring related bugs
Get rid of references to non-existent module
Merge branch 'master' of github.com:processone/ejabberd