Enable services for gate-grenade-devstack-vm

We don't need heat running for grenade in the gate.
But we need tempest and we need the same services
running for both the old and new devstack in grenade.
The logic for grenade is done separately here.

Fix bug 1193371
Fix bug 1193378

Change-Id: Ieb5498a69aec7b8c2d2b48e2ae89ad97a086e87e