installer: correct merged and packaged dependencies

- includes ucrt components directly in the binary path for pre-win10
  compatibility as per: https://stackoverflow.com/a/45984650/7853175

- simplifies the merge module expression

Change-Id: Iad6b03cc20b77b76b04435686d4fefd5ffca48b0

JamiInstaller/Product.wxs

@@ -17,9 +17,17 @@
             <ComponentRef Id="ApplicationShortcutDesktop" />
             <ComponentRef Id="ApplicationShortcutStartMenu" />
         </Feature>
-        <Feature Id="VCRedist" Title="Visual C++ Runtime" AllowAdvertise="no" Display="hidden" Level="1">
-            <MergeRef Id="VCRedist" />
-        </Feature>
+      <!--Visual C++-->
+      <DirectoryRef Id="TARGETDIR">
+        <Merge Id="VCRedist" SourceFile="$(env.VCRedistMergeModule)" DiskId="1" Language="0" />
+      </DirectoryRef>
+      <Feature Id="VCRedist"
+         Title="Visual C++ Runtime"
+         AllowAdvertise="no"
+         Display="hidden"
+         Level="1">
+        <MergeRef Id="VCRedist"/>
+      </Feature>
 
       <!--Find User Defined Installition Registry If User changes the Default Registry-->
       <Property Id="APPLICATIONFOLDER" Secure="yes">
@@ -63,7 +71,6 @@
                     Target="[#fileMain.exe]" WorkingDirectory="INSTALLFOLDER" />
                 <RemoveFolder Id="DesktopFolder" On="uninstall" />
                 <RegistryValue Root="HKCU" Key="Software/$(var.Name)" Name="desktop" Type="integer" Value="1" KeyPath="yes" />
-                <!--<Condition>ADDDESKTOPSHORTCUT=1</Condition>-->
             </Component>
         </DirectoryRef>
 
@@ -73,7 +80,6 @@
                     Target="[#fileMain.exe]" WorkingDirectory="INSTALLFOLDER" />
                 <RemoveFolder Id="StartMenuFolder" On="uninstall" />
                 <RegistryValue Root="HKCU" Key="Software/$(var.Name)" Name="startmenu" Type="integer" Value="1" KeyPath="yes" />
-              <!--<Condition>ADDDESKTOPSHORTCUT=1</Condition>-->
             </Component>
         </DirectoryRef>
     </Fragment>
@@ -82,7 +88,7 @@
         <UI Id="CustomUI">
           <Property Id="WixAppFolder" Value="WixPerMachineFolder" />
 
-          <!--ApplicationFolderName required by WixUI_Advanced -->
+          <!--APPLICATIONFOLDER required by WixUI_Advanced, ApplicationFolderName reset APPLICATIONFOLDER path-->
           <Property Id="ApplicationFolderName" Value="$(var.Manufacturer)\$(var.Name)" />
           <UIRef Id="WixUI_Advanced" />
 
@@ -121,9 +127,4 @@
         <WixVariable Id="WixUILicenseRtf" Value="$(var.ReleaseDir)\License.rtf"/>
     </Fragment>
 
-    <Fragment Id="VCRedist">
-        <DirectoryRef Id="TARGETDIR">
-            <Merge Id="VCRedist" SourceFile="$(env.VCRedistMergeModule)" DiskId="1" Language="0" />
-        </DirectoryRef>
-    </Fragment>
 </Wix>