backport of aggregates compatibility fix

this is the aggregates compatibility fix for stable/grizzly (coming
from master). This should let stable/grizzly exercises pass which
will let us do grenade runs on stable/havana.

Change-Id: Iaa0cf13a287a206442c611b4f2805c2fb0c90e9f