Merge "Fixing generateLinks and java docs"