Improved cleanup code after host bind-mount test.

[#83769328]

Signed-off-by: Glyn Normington <gnormington@pivotal.io>