Merge "Treat etcd as standard static target"