Merge proposals dependent on lp:~alai/charms/trusty/etcd/trunk

lp:~alai/charms/trusty/etcd/trunk has no merge proposals.