Merge "Added $wgHTTPImportTimeout setting"