Update header files from ejabberd master
Fix mod_rest to work with ejabberd master