Correctly quote spell text contents inside the xml container
Make cleanup() method public
Don't trim whitespace in folder names (#1488955)

Conflicts:

	plugins/managesieve/Changelog
Bump version number up to 6.2
- Fix regression in handling LDAP contact identifiers (#1488959)
Fix NUL characters in content-type of ms-tnef attachment (#1488964)
Merge branch 'release-0.9' into rutgers_release-0.9