Applied patch for WIXFEAT4190, engine changes for self updating bundles.
Reverted unintentional change from bad patch.
Merge branch 'develop' into WIXFEAT4190
Merge remote-tracking branch 'remotes/upstream/develop' into WIXFEAT4190

Conflicts:
	src/burn/engine/plan.cpp
Add netfx 4.5.2 support to NetFxExtension
WIXBUG:4243 - use hashes to verify bundled packages by default.
Use GetLastError when ShellExecuteEx fails.
Put Burn command line arguments first when launching unelevated parent process since malformed user arguments created an infinite loop
Document limitations of VersionVariables and create NormalizeVersion method.
Add WixBundleExecutePackageCacheFolder variable.
Replace ExitOnWin32Error with ExitWithLastError.
Use UInt16.MaxValue instead of ushort.MaxValue and a static readonly string with String.Format for the error message.
Make CacheGetCompletedPath always add a trailing backslash.
Fix height of InstallDirDlg description in Russian localization
WixStdBA should only set m_fPrereqAlreadyInstalled and m_fPrereqInstalled if it is the PreqBA.
Merge pull request #56 from rseanhall/4161

Fix bug from 4161
Merge pull request #53 from rseanhall/bug3951

WIXBUG:3951 - Engine.VersionVariables
Merge pull request #54 from sryze/patch-1

Fix height of InstallDirDlg description in Russian localization
Merge branch 'bug3890' of git://github.com/rseanhall/wix3 into develop

Conflicts:
	History.md
Merge branch 'develop' of https://github.com/wixtoolset/wix3 into develop