Merge "jsduck: Clean up odd use of @returns instead of @return"