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
Merge pull request #29 from jchoover/WIXFEAT4190.1

Wixfeat4190.1