Fixes for when using bind mounts.
Merge pull request #19113 from garethgreenaway/19003_2014_7_bind_mounts

Fixes for when using bind mounts.