Separate JMS integration from ActiveMQ-specific code.
Merge changes.