Follow up to fix failing upgrade tests - TRUNK-4446