Merge pull request #870 from clebertsuconic/Branch_2_2_AS7

https://issues.jboss.org/browse/HORNETQ-988 - Wildcard issue fix and tes...
https://issues.jboss.org/browse/HORNETQ-1142 fixing races during start and expiry