Few changes for Vagrant and etcd setup.