HORNETQ-979 - NPE when redeploy hornetq-users.xml

HORNETQ-979 - NPE when redeploy hornetq-users.xml
Merge branch 'master' of github.com:diegolovison/hornetq