Adjustments to 'collection_locations' table in 'create.mysql.sql'.
Merge branch 'master' into develop