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