Merge branch 'master' of https://github.com/vegbye/vsb-fou

Conflicts:
	vsb-fou-jms-activemq/src/test/java/vsb/fou/jms/activemq/client/MockCtxActiveMqClientEnv.java
	vsb-fou-jms-activemq/src/test/java/vsb/fou/jms/activemq/producer/DialogueJmsListenerMock.java
	vsb-fou-jms-activemq/src/test/java/vsb/fou/jms/activemq/producer/MockCtxActiveMqClientEnv.java
	vsb-fou-jms-activemq/src/test/java/vsb/fou/jms/activemq/springtestutils/MockCtxActiveMqClientEnv.java
	vsb-fou-jms-activemq/src/test/java/vsb/fou/jms/activemq/springtestutils/TestCtxActiveMqEnv.java