Revert "Merge branch '114-update-follett-metadata-to-use-emailaddress-nameid' into 'master'"

This reverts merge request !140 (merged)

Reverting nameid back to persistent at Follett's request