Merge pull request #584 from jbonofre/AMQ-8025

Improve ActiveMQ feature to avoid mistake to use Spring 5