This follows !1034 (merged) and !1058 (merged) to get rid of commits shouldn't be in b2oc_upgrade.
b2oc_upgrade