Merge "add etcd_control node classification"