add plone.app.users branch. cleanup and remove old fixes