Update websockets port

See pull request #105 from esl/ejabberd
Merge branch 'ejabberd_cowboy' of https://github.com/PaulSD/ejabberd_tests into PaulSD-ejabberd_cowboy
add metrics port to test.config
Add vcard wildcard search test
improve cooperation with stock Ejabberd
use test spec files to customize tests
Bump escalus version
use escalus:assert instaed of escalus_new_assert:assert
Merge pull request #33 from esl/test_specs

Test specs and interoperability with EJD
Merge remote-tracking branch 'upstream/master' into arc-mod-mam-release

Conflicts:
	run_common_test.erl