Merge change Iff8a3e91

* changes:
  Adding timeouts to HttpsURLConnectionTest.