Merge pull request #1388 from clebertsuconic/master

https://issues.jboss.org/browse/HORNETQ-1280 - expiry delay fix
HORNETQ-1281 - Do not log passwords at any level
Merge pull request #1389 from jbertram/master

HORNETQ-1281 - Do not log passwords at any level
Merge pull request #1392 from clebertsuconic/master

https://issues.jboss.org/browse/HORNETQ-1280 - merging tests