Merge branch 'master' into kvakvs-dialyzer-dev

Conflicts:
	apps/ejabberd/include/ejabberd.hrl
	apps/ejabberd/include/jlib.hrl
	apps/ejabberd/src/cyrsasl.erl
	apps/ejabberd/src/cyrsasl_plain.erl
	apps/ejabberd/src/ejabberd_auth.erl
	apps/ejabberd/src/ejabberd_auth_anonymous.erl
	apps/ejabberd/src/ejabberd_auth_external.erl
	apps/ejabberd/src/ejabberd_auth_internal.erl
	apps/ejabberd/src/ejabberd_auth_ldap.erl
	apps/ejabberd/src/ejabberd_auth_odbc.erl
	apps/ejabberd/src/ejabberd_c2s.erl
	apps/ejabberd/src/ejabberd_metrics_hooks.erl
	apps/ejabberd/src/ejabberd_s2s_out.erl
	apps/ejabberd/src/ejabberd_sm.erl
	apps/ejabberd/src/ejabberd_snmp_hooks.erl
	apps/ejabberd/src/ejabberd_tls.erl
	apps/ejabberd/src/jlib.erl
	apps/ejabberd/src/mod_bosh.erl
	apps/ejabberd/src/mod_roster.erl
	apps/ejabberd/src/mod_roster_odbc.erl