CRM-15365 - Windows directory fixes