Merge "Fix ReferencesHidden issues in apache http"