Merge proposals dependent on lp://qastaging/~james-page/charms/precise/rabbitmq-server/config-changed-restart-fix

lp://qastaging/~james-page/charms/precise/rabbitmq-server/config-changed-restart-fix has no merge proposals.