Merge "Add external gateway to dvr before scheduling with dvr_snat agent"