Reverted commit from feature branch
Fixed references to amp.bus.rabbit in services