Merge pull request #911 from clebertsuconic/Branch_2_2_EAP

HORNETQ-1151 - avoiding NPE when deleting a queue and producing at the s...