Merge "Fix up Newton->Ocata rabbitmq ha policy"