Add --force-overwrite to apt-get invocation, as was done on master.