Small changes to java formatting.
jsonrpc and id parameters no longer required for HTTP GET requests.
Now get ServletRequestInfo is private and getServletOutputStream is
protected.
fixed null pointer error
fixed IllegalStateException
fixed null pointer error and fixed json error messages.

Change-Id: Iaca2fa59ade4ce32201568618f03df2dbee6ac12
tweaked backwards compatibility code

Change-Id: I474dc813324b45c654f5cda82b0cf8d11f4d045e
two-way linking without clicking button
Merge remote-tracking branch 'origin/master' into foo