Fixed up MSI generation for new layout.   MinGW tests to follow.