Fix for AMQ-4857, added test for null before accessing protocol string
https://issues.apache.org/jira/browse/AMQ-4853

Add hashCode and equals override so that this object can be used in
collections properly
https://issues.apache.org/jira/browse/AMQ-4855

Deprecate the misspelled subcription named getters and use the correctly
spelled versions where the older ones are in use.
https://issues.apache.org/jira/browse/AMQ-4869
Fix for https://issues.apache.org/jira/browse/AMQ-4719
Fix for https://issues.apache.org/jira/browse/AMQ-4719
Fix for https://issues.apache.org/jira/browse/AMQ-4719
Fix for https://issues.apache.org/jira/browse/AMQ-4719
Commented out testOrderOnActivateDeactivate, see AMQ-4874
Fix for https://issues.apache.org/jira/browse/AMQ-4719
https://issues.apache.org/jira/browse/AMQ-4682 - add removal modification test
AMQ-4881: Upgrade to xbean 3.15. But keep the activemq-spring maven plugin at 3.12 as otherwise the generated schema is changed. See JIRA ticket for details.
[build] dependency updates
AMQ-2505: Sanitize hostname in Id generator to only include ascii chars as otherwise this can cause problems in openwire protocol.
https://issues.apache.org/jira/browse/AMQ-3388

ignore unknown fields in openwire commands to allow interop between
openwire versions.
Resolve merge conflict