Fix to -userdir on non-Windows
Merge upstream r12703-4