Merge pull request #658 from mattrpav/AMQ-8279

[AMQ-8279] Compiler warning cleanups