Update etcd key logic, add tests for kubecfg, clean-up resthandler