Merge tag 'upstream/1.6.0+snapshot20161117'

Upstream version 1.6.0+snapshot20161117

Merge tag 'upstream/1.6.0+snapshot20161117'
Upstream version 1.6.0+snapshot20161117
dd6b25de · Arturo Borrero Gonzalez · 8fceaf37 · 7b095084 · 8fceaf37 · dd6b25de
Commit dd6b25de authored Nov 17, 2016 by Arturo Borrero Gonzalez
--- a/iptables/.gitignore
+++ b/iptables/.gitignore
--- a/iptables/Makefile.am
+++ b/iptables/Makefile.am
--- a/iptables/Makefile.in
+++ b/iptables/Makefile.in
--- a/iptables/ip6tables-restore.c
+++ b/iptables/ip6tables-restore.c
--- a/iptables/ip6tables.c
+++ b/iptables/ip6tables.c
--- a/iptables/iptables-restore.c
+++ b/iptables/iptables-restore.c
--- a/iptables/iptables.8.in
+++ b/iptables/iptables.8.in
--- a/iptables/iptables.c
+++ b/iptables/iptables.c
--- a/iptables/nft-ipv4.c
+++ b/iptables/nft-ipv4.c
--- a/iptables/nft-ipv6.c
+++ b/iptables/nft-ipv6.c
--- a/iptables/nft-shared.c
+++ b/iptables/nft-shared.c
--- a/iptables/nft-shared.h
+++ b/iptables/nft-shared.h
--- a/iptables/nft.c
+++ b/iptables/nft.c
--- a/iptables/nft.h
+++ b/iptables/nft.h
--- a/iptables/xshared.c
+++ b/iptables/xshared.c
--- a/iptables/xshared.h
+++ b/iptables/xshared.h
--- a/iptables/xtables-arp.c
+++ b/iptables/xtables-arp.c
--- a/iptables/xtables-compat-multi.c
+++ b/iptables/xtables-compat-multi.c
--- a/iptables/xtables-multi.h
+++ b/iptables/xtables-multi.h
--- a/iptables/xtables-restore.c
+++ b/iptables/xtables-restore.c