cleanup
Plone 5 upgrade: Respect previous installed plone.app.event when migrating first_weekday setting.
Add empty upgrade step for 5.0a2
Fixed merging issues