Merge branch 'mysql-5.6' into mysql-5.7

Conflicts:
	packaging/WiX/mysql_server.wxs.in

Author: sreedhars

packaging/WiX/mysql_server.wxs.in

@@ -78,14 +78,18 @@
     </InstallUISequence>
 
     <!-- Find previous installation -->
-    <Property Id="INSTALLDIR">
+    <Property Id="GETINSTALLDIR">
       <RegistrySearch Id="FindInstallLocation"
           Root="HKLM"
           @Win64@
           Key="Software\Microsoft\Windows\CurrentVersion\Uninstall\[OLDERVERSIONBEINGUPGRADED]"
           Name="InstallLocation"
           Type="raw" />
     </Property>
+    <CustomAction Id="SetInstall"    Property="INSTALLDIR" Value="[GETINSTALLDIR]" />
+    <InstallUISequence>
+       <Custom Action="SetInstall"    After="AppSearch">Installed</Custom>
+    </InstallUISequence>
     <Property Id="OLDERVERSION"> 
       <RegistrySearch Id="FindOlderVersion"
         Root="HKLM"