Get rid of `extra` field handling in principals
clean up references to `extra` field
Merge pull request #913 from stuartf/removeExtra

Get rid of `extra` field handling in principals util.js and dao.js
Merge branch 'master' into avocet-master