Merge "Add '-w' option to ip[6]tables-restore"