Fix failing test due to missing user directory cleanup
Merge branch 'master' into 5.6.0