Merge "Add http_client_ip_address field for Apache WSGI logging"