Merge "Add etcd system class"