refs #6998 fix condition statement
Merge branch 'dev' of github.com:nysenate/Bluebird-CRM into dev