Merge "Flip condition in ApacheHttpClientTest" into jb-dev