Functional: - items from meeting with Erik O, Robbin, Jesper and Mary: - backout HandshakeAfterDeflateIdleMonitors option and always do a handshake after deflation - backout C2 ref_count changes since handshake after deflation closes the race - items from the hunt for 8230249: - backout marking the ObjectMonitor::_header field - log when cas_set_mark() in install_displaced_markword_in_object() fails due to a race - call try_set_owner_from(DEFLATER_MARKER, NULL) as needed to clear the owner field Test update: - backout workaround in test/jdk/java/rmi/server/UnicastRemoteObject/ unexportObject/UnexportLeak.java since ServiceThread deflation should solve that problem Cleanup: - rename set_om_ptr_if_safe() to save_om_ptr_if_safe() - delete unused ref_count_offset_in_bytes() - fix pad size error in print_debug_style_on(() - reformat some code with really long lines - clarify comments - copyright year changes (a new year has arrived!)