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

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