Update to match latest code. Rabbit relay service