Merge "Bug 1672 - Generated javadoc contains symbols of javadoc comment tags"