Simplify ActiveMQ configuration
Update ActiveMQ to 5.7.0