Latest schema changes incorporated into upgrade scripts.

Bartek Wronarequested to merge
bw_upgrade_fixes into develop

Merge request reports