Better umount workarounds for mock

This started to cause problems when concurrent builds happened. Fixed now