Merge proposals dependent on lp://qastaging/~niedbalski/charms/trusty/cinder/remove-unused-services

lp://qastaging/~niedbalski/charms/trusty/cinder/remove-unused-services has no merge proposals.