Apply recent HornetQ fixes to ActiveMQ-6