Merge pull request #668 from mattrpav/AMQ-8290

[AMQ-8290] Cleanup assembly warnings and upgrade assembly plugin