Don't skip cellsv2 setup for cellsv1
Don't skip cellsv2 setup for cellsv1

Since cellsv2 setup is no longer optional, we can't even exclude
cellsv1 from this step. Since cellsv1 users can't use the simple
command, this does the individual steps as needed.

Depends-On: Icfbb17cce8ce8b03dc8b7b4ffb202db01e5218a6
Change-Id: I3c9101a34b2bb0804fc4deda62dbb8637e7b8f94

richliu/devstack,dtroyer/devstack,noironetworks/devstack,openstack-dev/devstack,bswartz/devstack,bswartz/devstack,nawawi/openstack,richliu/devstack,dtroyer/devstack,group-policy/devstack,group-policy/devstack,openstack-dev/devstack,nawawi/openstack,noironetworks/devstack