hg: jdk9/sandbox/hotspot: Merge

[erik.joelsson at oracle.com]

Changeset: 0a77206eb258
Author:    erikj
Date:      2015-10-29 17:34 +0100
URL:       http://hg.openjdk.java.net/jdk9/sandbox/hotspot/rev/0a77206eb258

Merge

- src/share/vm/gc/shared/genRemSet.cpp
- src/share/vm/gc/shared/genRemSet.hpp
- src/share/vm/gc/shared/watermark.hpp