Merge "Fixes router external_fixed_ip tests sometimes failing with Conflict."