Always remove staged config file
Correctly convert etcd paths to keys even when prefix does not end with a '/'