Merge "Update activemq to 1.5.11"