Merge "Keep returnto, returntoquery on Special:CreateAccount redirect"