Merge pull request #847 from diegolovison/master

HORNETQ-979 - NPE when redeploy hornetq-users.xml
https://issues.jboss.org/browse/HORNETQ-1132 - include expired queue on the original properties