fixed amqp_provider and rbd param names
Merge remote branch 'upstream/ui' into ui