Merge pull request #653 from coheigea/AMQ-8260

AMQ-8260 - Remove unused keys from distribution