CRM-14653 installer/uninstaller fix