Don't roll over to a lower GM view version than we have ourselves
Merge bug 25671
stable to default