Merge branch 'amf/remove_activemq' into sprint100