--- a/.hgtags-top-repo	Tue Jul 25 18:36:19 2017 -0700
+++ b/.hgtags-top-repo	Thu Aug 24 16:30:09 2017 +0200
@@ -436,3 +436,4 @@
 84777531d994ef70163d35078ec9c4127f2eadb5 jdk-9+176
 a4371edb589c60db01142e45c317adb9ccbcb083 jdk-9+177
 a6c830ee8a6798b186730475e700027cdf4598aa jdk-10+15
+2fe66ca1e2b3c361f949de9cb2894661dc0a3fa2 jdk-10+16

--- a/hotspot/.hgtags	Tue Jul 25 18:36:19 2017 -0700
+++ b/hotspot/.hgtags	Thu Aug 24 16:30:09 2017 +0200
@@ -596,3 +596,4 @@
 2ab74e5dbdc2b6a962c865500cafd23cf387dc60 jdk-9+176
 1ca8f038fceb88c640badf9bd18905205bc63b43 jdk-9+177
 c1f3649a3a42f124b418a5a916dbad13d059b757 jdk-10+15
+2fe2a593e8ebf3a9e4dcd9ba3333a7b43126589d jdk-10+16

--- a/test/lib/jdk/test/lib/util/FileUtils.java	Tue Jul 25 18:36:19 2017 -0700
+++ b/test/lib/jdk/test/lib/util/FileUtils.java	Thu Aug 24 16:30:09 2017 +0200
@@ -98,7 +98,7 @@
         while (true) {
             try {
                 Files.delete(path);
-                while (Files.exists(path)) {
+                while (!Files.notExists(path)) {
                     times++;
                     if (times > MAX_RETRY_DELETE_TIMES) {
                         throw new IOException("File still exists after " + times + " waits.");