Merge proposals dependent on lp://qastaging/~tvansteenburgh/charms/trusty/rabbitmq-server/add-amulet-test

lp://qastaging/~tvansteenburgh/charms/trusty/rabbitmq-server/add-amulet-test has no merge proposals.