Merge pull request #1929 from jbertram/master

HORNETQ-1297 and broken tests from HORNETQ-1437
HORNETQ-1297 Tweak check for sub name
Validate destinationType for MDB