Change in jenkins[master]: Make mock_cleanup.sh safer about un-mouting