Merge "rework etcd3 install to be like other devstack services"