Merge pull request #904 from clebertsuconic/master

HORNETQ-1151 - avoiding NPE when deleting a queue
HORNETQ-1151 - avoiding NPE when deleting a queue and producing at the same time - small fix