--- old/src/hotspot/share/runtime/globals.hpp	2017-10-11 15:25:37.391407761 +0200
+++ new/src/hotspot/share/runtime/globals.hpp	2017-10-11 15:25:37.152397498 +0200
@@ -604,6 +604,13 @@
   develop(bool, CleanChunkPoolAsync, true,                                  \
           "Clean the chunk pool asynchronously")                            \
                                                                             \
+  product(bool, ThreadLocalHandshakes, false,                               \
+          "Enable use of thread local handshake operations")                \
+          constraint(ThreadLocalHandshakesConstraintFunc,AfterErgo)         \
+                                                                            \
+  diagnostic(uint, HandshakeTimeout, 0,                                     \
+          "If nonzero set a timeout in milliseconds for handshakes")        \
+                                                                            \
   experimental(bool, AlwaysSafeConstructors, false,                         \
           "Force safe construction, as if all fields are final.")           \
                                                                             \