upgrade upstream etcd

Also update to new skel files