JERSEY-2207: OAuth filter fails to use proxy when using Apache HTTP Client

 - Added fix from Gerard.

Change-Id: Ibfe02f1db701e6f22d8623402e2fb5c22915321f
JERSEY-996: generated new keystore and trustore for https-clientserver-grizzly sample

Change-Id: I21a09fa0914ed4b35a712bac7a3aba55f30c9514
Merge "JERSEY-2207: OAuth filter fails to use proxy when using Apache HTTP Client"
Merge "JERSEY-996: generated new keystore and trustore for https-clientserver-grizzly sample"