HORNETQ-1398 - fix broken tests and reintstate support for PKCS#11 keystores
Merge pull request #1827 from jbertram/master_HORNETQ-1398

HORNETQ-1398 - fix broken tests and reintstate support for PKCS#11 keyst...
Bug 1132196(HORNETQ-1389) - JGroupsBroadcastGroupConfiguration Serialization Problem
updating to latest of UPS java client
Merge pull request #1828 from gaohoward/master_HORNETQ-1389-2

Bug 1132196(HORNETQ-1389) - JGroupsBroadcastGroupConfiguration Serialization Problem
Merge pull request #1831 from matzew/UnifiedPushClientUpdate

updating to latest of UPS java client
AMQP Multi Protocol support
Refactoring text / map out of HornetQMessage into an utility class
more utilities
converter
Refactoring conversion
convertion refactoring
refactoring jms and amqp