Merge
diff --git a/.hgtags-top-repo b/.hgtags-top-repo
index 29704e5..afa6e4b 100644
--- a/.hgtags-top-repo
+++ b/.hgtags-top-repo
@@ -374,3 +374,4 @@
765a17e75fd622f7b892381e23c9b2c531d416f0 jdk8u40-b21
b6d03a810a61116268fea08517a9632bd66a7363 jdk8u40-b22
5dd2ad6c7911a1e21f15a28f13ffad662378a3be jdk8u40-b23
+5b37e6757d7c95c9c58b07fb3c9eba234567385a jdk8u40-b24
diff --git a/corba/.hgtags b/corba/.hgtags
index 4e75b0e..b94f89b 100644
--- a/corba/.hgtags
+++ b/corba/.hgtags
@@ -377,6 +377,7 @@
4c7421f74674ebefb8e91eba59ab2a2db8c1abd7 jdk8u40-b22
62f7faef5ed956cd481cae6216b22fdb4b6e3e46 jdk8u40-b23
472aa5bae0e78614e873d56bcc31e7caba49963c jdk8u40-b24
+2220744100b8487976debff79e5d0c7d70738bda jdk8u40-b25
5761efbc739fdedcbff224e22f920e88b29af4cf jdk8u45-b00
6a52852476c9ccb2d52153d1b94b675e863bb28c jdk8u45-b01
3b9d342f9f584465ea5976e06357b45682f9681d jdk8u45-b02
diff --git a/hotspot/.hgtags b/hotspot/.hgtags
index ec8d1c2..9782db0 100644
--- a/hotspot/.hgtags
+++ b/hotspot/.hgtags
@@ -586,3 +586,4 @@
0f0cb4eeab2d871274f4ffdcd6017d2fdfa89238 hs25.40-b25
0ee548a1cda08c884eccd563e2d5fdb6ee769b5a jdk8u40-b22
0e67683b700174eab71ea205d1cfa4f1cf4523ba jdk8u40-b23
+fa4e797f61e6dda1a60e06944018213bff2a1b76 jdk8u40-b24
diff --git a/jaxp/.hgtags b/jaxp/.hgtags
index c7f62cb..c628280 100644
--- a/jaxp/.hgtags
+++ b/jaxp/.hgtags
@@ -374,3 +374,4 @@
78d90db9de2801eec010ccb9f0db3caf969dfc3b jdk8u40-b21
54a13451ce243f2159ed3996e6efcf374a5750ca jdk8u40-b22
e07fbae1efeac4e50514384caa7d226af7414114 jdk8u40-b23
+048cebd17f73f23ce2295e360f31c1b6788195aa jdk8u40-b24
diff --git a/jaxws/.hgtags b/jaxws/.hgtags
index 6ddadd5..ecb029c 100644
--- a/jaxws/.hgtags
+++ b/jaxws/.hgtags
@@ -372,3 +372,4 @@
16485a38b6bc762b363f4e439047486742fbcfcb jdk8u40-b21
6e928fd9152541eddf25694be89eb881434a5c5f jdk8u40-b22
b6755a463ccf6a79b1e1a43ed7bdb1c5cb1ac17d jdk8u40-b23
+5fbbfd66643edb81cfa0688825d698dcc5f2eb11 jdk8u40-b24
diff --git a/jdk/.hgtags b/jdk/.hgtags
index 7b01af4..43043b1 100644
--- a/jdk/.hgtags
+++ b/jdk/.hgtags
@@ -375,3 +375,4 @@
564bca490631e4ed4f7993e6633ed9ee62067624 jdk8u40-b21
d168113f9841a77b3cee3a6a45fcd85b7351ac90 jdk8u40-b22
41fe61722ce96b75dd3a1ba5072473122e21e5a0 jdk8u40-b23
+9d903721276c8684706db7ecfb6cda568e9f4f69 jdk8u40-b24
diff --git a/langtools/.hgtags b/langtools/.hgtags
index 55aa820..b938d82 100644
--- a/langtools/.hgtags
+++ b/langtools/.hgtags
@@ -372,3 +372,4 @@
9113c7c8d902ec94b28ca0ef4a6466bdba65fcfc jdk8u40-b21
79177246b3dbe5296fb53755d8695acdaef59fc8 jdk8u40-b22
fb294b49373bda0b3afc7f011d64ecefed73b42e jdk8u40-b23
+c5d4ffa220f3824c2ea5d39dc99d41a9df9e5ae5 jdk8u40-b24
diff --git a/nashorn/.hgtags b/nashorn/.hgtags
index 8940afb..f9601da 100644
--- a/nashorn/.hgtags
+++ b/nashorn/.hgtags
@@ -360,3 +360,4 @@
dbb663a9d9aa2807ef501c7d20f29415816a1973 jdk8u40-b21
f9f70a0f60f48fbb95275b6c1110cedf740c6177 jdk8u40-b22
6ca090832d30fd0e46214ccc00816490ad75a8ab jdk8u40-b23
+b2ce5df33715583c898530560d4202853b9ff9bc jdk8u40-b24