Fix sync bug CLB-633 and stop creating an HTTPSRedirect VS too early in the sync process.