merge branches/slowclosing: fix handling of exceptions during close, randomly close slowly in mockdir