Use is_enabled() in folsom->grizzly upgrade (bug 1167421)

Change-Id: Iddc10167c94deacec07cab7ec9316849263fb462