Merge pull request #880 from clebertsuconic/Branch_2_2_EAP

fixing ExpireTestOnRestartTest
HORNETQ-1146 Fix configuration file of address-settings:
must trim fields.
Merge pull request #888 from FranciscoBorges/Branch_2_2_EAP

HORNETQ-1146 Fix configuration file of address-settings:
HORNETQ-1151 - avoiding NPE when deleting a queue and producing at the same time
fix