Merge pull request #510 from jbonofre/AMQ-7301

[AMQ-7301] Fix build and using a single log message