https://issues.jboss.org/browse/HORNETQ-1169: fix on delivery order during direct-delivery switch under load: broken after https://issues.jboss.org/browse/HORNETQ-1137
Merge pull request #984 from clebertsuconic/Branch_2_2_AS7

fixes after specJMS tests
https://issues.jboss.org/browse/HORNETQ-1183 - fixing check up on startup
Merge pull request #1020 from clebertsuconic/Branch_2_2_AS7

https://issues.jboss.org/browse/HORNETQ-1183 - fixing check up on startup