Make cleanup() method public
Don't trim whitespace in folder names (#1488955)

Conflicts:

	plugins/managesieve/Changelog
Bump version number up to 6.2