Post-merge fix-ups of low-pri feedback requests
WixBuild: Version 3.9.616.0
Merge pull request #82 from wixbuild/develop

WixBuild: Version 3.9.616.0
Merge pull request #80 from heaths/postmerge

Post-merge fix-ups of low-pri feedback requests