Merge "Fix javadoc which was broken with renames" into rvc-dev