Bug 1204924 added entry for allow_overlapping_ips force_gateway_on_subnet

Change-Id: Iddc652c0b606f23a50ba8ab1778dd71295fa29e2
Merge "Bug 1204924 added entry for allow_overlapping_ips force_gateway_on_subnet"