Update devstack-gate grenade branches for G/H.

Master should now test grizzly->master upgrades.

Change-Id: I38105f7300f0b44403d376c89a4698ad503f77a6