Revert "Revert K8S to use etcd2 storage format"
Revert "Revert K8S to use etcd2 storage format"

This reverts commit 5e95b0b0fb90d3d8ebd37df0e640303579c9e2c4.

This was pushed to master, rather than a branch, by accident.

kubic-project/salt,ereslibre/salt,ereslibre/salt,ereslibre/salt,kubic-project/salt,kubic-project/salt