Fix for aetos to use AMQ 5.7.0 and clean up config files