Merge pull request #2 from ARGOeu/devel

Sprint 22 Release
Removed decomissioned brokers from config files
Merge pull request #3 from pkoro/devel

Removed decomissioned brokers from config files