Be less picky about what form fields are called.

When plone.app.users goes formlib -> z3cform field names will change. Deal with both.
Merge pull request #142 from lentinj/master

Prepare for p.a.users z3cform conversion