patch 8.2.0016: test name used twice, option not restored properly

Problem:    Test name used twice, option not restored properly.
Solution:   Rename function, restore option with "&".

src/testdir/test_textformat.vim

@@ -906,7 +906,7 @@ func Test_ra_multibyte()
 endfunc
 
 " Test for 'whichwrap' with multi-byte character
-func Test_whichwrap()
+func Test_whichwrap_multi_byte()
   new
   let t =<< trim END
     á
@@ -917,7 +917,7 @@ func Test_whichwrap()
 
   set whichwrap+=h
   normal dh
-  set whichwrap-=h
+  set whichwrap&
 
   let expected =<< trim END
     áx

src/version.c

@@ -742,6 +742,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    16,
 /**/
     15,
 /**/