Merge "For support non-clustered RabbitMQ configuration added check of use_vip_address option for nova.controller.nova_update_cell1 state"