Merge pull request #882 from clebertsuconic/master-expire-fix

Expire fixes on master
https://issues.jboss.org/browse/HORNETQ-1142 fixing races during start and expiry
opt-queue-master