Merge pull request #875 from clebertsuconic/Branch_2_2_AS7

https://issues.jboss.org/browse/HORNETQ-1142 fixing races during start a...
fixing ExpireTestOnRestartTest