Merge branch 'master' into dsuch-f-gh280-solr-connector
Merge branch 'dsuch-f-gh280-solr-connector'
Merge branch 'master' into dsuch-f-gh118-tls-http-outconns