AMQ-4414 - Combine windows and unix distros