Merge from master to 2.2.x for Scala JSON doc rewrite (issue 2395)
Merge pull request #2462 from kipsigman/2.2.x

Merge from master to 2.2.x for Scala JSON doc rewrite (issue 2395)