Small fixes for tests
Merge branch 'master' of https://github.com/kifj/stomp-test.git

Conflicts:
	pom.xml
Merge branch 'master' of https://github.com/kifj/stomp-test

Conflicts:
	pom.xml
Update pom
Merge branch 'master' of https://github.com/kifj/stomp-test
Upgrade for JBoss EAP 6.1