refs #6109 fix how uf_match is constructed; account for logged in user;
Merge branch 'dev' of github.com:nysenate/Bluebird-CRM into dev
fixes #7022 school district long form