[ejabberd/f21] (3 commits) ...Fixes