Upgrade to agoric-upgrade-7