Merge "Use User::getDefaultOption() instead of $wgDefaultUserOptions"