Merge proposals dependent on lp://qastaging/~corey.bryant/charms/trusty/nova-compute/amulet-git-fixups

lp://qastaging/~corey.bryant/charms/trusty/nova-compute/amulet-git-fixups has no merge proposals.