Fix upgrade script to dynamically add COLUMN_MODIFIER and SALT_BUCKETS, Fix bug in detection of tables that require upgrade
Rolling the master branch version forward now that 2.0.0 is out