Merge pull request #21 from khink/master

Fix conversation view: shouldn't break on invalid URLs
Prepare 2.2.1 release.
Pep8.
first check if captcha is installed before we open browsers zcml files that depend on these packages, fixes #12118 and #12774
update changes
Back to development.
fix migration of author_name and author_username
Merge pull request #22 from maartenkling/master

first check if captcha is installed before we open browsers zcml
Fix changelog. the latest pull request has not been included in the 2.2.1 release.
Prepare 2.2.2 release.
Back to development.
simplify some of the logic and get some tests in place to cover them. TDB: test against actual site to ensure the changes to the logic don't break a real environment, but still work with the tests..
move creation of test user to test setup, rather than just in the new test_migrate_comment_with_creator() method
use member.getProperty('fullname') if member.fullname is an empty string. Not sure in what case this would happen, but it did happen in my site migration
add anonymous_email_enabled settings to really let integrator activate it. add the migration script which add the option to the registry and do not change the behavior: the email will not be displayed by default
remove upgrade step from here. all upgrade step of plone goes to plone.app.upgrades
update changelog
Pep8.
Pep8
Preparing release 2.2.3