Merge "Fix build: javadoc @link pointers need HTML-style #refname"