ipt_mgr.ipv6 written in the wrong ipt_mgr.ipv4

This patch fixes the issue of writing the wrong firewall rule where an IP6
rule is written to IP4.

Change-Id: Ie7c75c71c9dcfbd9feabaffe4416ede80ff350d8
Closes-Bug:#1263877
ML2/vxlan/test: remove unnecessary self.addCleanup(cfg.CONF.reset)

This patch is follow up of change set of
4808f91eb2c245344517fc89c37c6c4c88e9051b bug/1260262 review/61694.
The change set adds unnecessary self.addCleanup(cfg.CONF.reset) to
VxlanTypeMultiRangeTest as pointed out. This patch Remove the line.

Change-Id: Ia6ce4bc346cf6320ba556e80689dadb7d84e5ee8
Merge "ML2/vxlan/test: remove unnecessary self.addCleanup(cfg.CONF.reset)"
Merge "ipt_mgr.ipv6 written in the wrong ipt_mgr.ipv4"