refs #7249 upgrade script fixes
refs #7249 update bb version
Merge branch 'dev' of github.com:nysenate/Bluebird-CRM into dev