Fix unicorn upgrades: really wait for the new master to replace the old one