Put final and static qualifiers on special json tags, for clarity

git-svn-id: https://svn.apache.org/repos/asf/manifoldcf/trunk@1486087 13f79535-47bb-0310-9956-ffa450edef68
Fix for CONNECTORS-692.

git-svn-id: https://svn.apache.org/repos/asf/manifoldcf/trunk@1486135 13f79535-47bb-0310-9956-ffa450edef68
Merge remote-tracking branch 'upstream/trunk' into trunk