acu157027 - Make deploy work for both HTTP and AMQP mode