Merge pull request #881 from clebertsuconic/Branch_2_2_AS7

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

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