Introduced constant ClientPNames/CONN_MANAGER_TIMEOUT for "http.conn-manager.timeout". The parameter name had changed upstream and its type could not be casted correctly which is necessary to set it into apache.http.
Tests: updated the param name in a test, it changed upstream.
Merge remote-tracking branch 'dedeibel/master'
Update changelog and minor whitespace changes