Merge "Use regular slaves for user contribs parent revision queries"