Update glance::notify::rabbitmq options

This patch is aim to update rabbitmq options in notify::rabbitmq
class to keep consistent with glance-api.conf. And fix description
error in comment.

Fixes bug #1221008

Change-Id: I441a61bb683552e1696f779c733db561cca03b64
(cherry picked from commit e2fef179c13faf0a4ac6d1a512701cb873ede355)
Update glance::backend::rbd options

This patch is aim to add rbd options in glance-api.conf
and also update related spec test.

Fixes bug #1221074

Change-Id: Ifcbaf15ab4a7aedb074abac42941181e53d538c4
(cherry picked from commit 6dc226bbde6a3fffb5be200df0801ff3e91ceecf)
Merge "Update glance::notify::rabbitmq options" into stable/grizzly