Upgradestep rolemap

Hope to have correctly followed the convention, PR according to our discussion on https://github.com/plone/Products.CMFPlone/pull/236, critique very much welcome.