Merge "Add etcd composable upgrade steps"