Updated Samples

closes #1726
Fixing the exe name of the host

Fixes #1727
The actual fix for #1727
Merge branch 'release-4.2.0'