Merge changes made for Google Search Appliance in jsonp.xsl to json.xsl