refs #7653 also trim on validate for org/house
Merge branch 'dev' of github.com:nysenate/Bluebird-CRM into dev