MBS-7205: absolute bare-minimum schema change
MBS-7205: add defaulting/not-null behavior to upgrade script
MBS-7205: update createtables for cardinality
(fix indentation)
Merge branch 'schema-change-2014-05' into mbs-7205-link-type-cardinality

Conflicts:
	upgrade.sh
Merge branch 'schema-change-2014-05' into mbs-7205-link-type-cardinality

Conflicts:
	admin/sql/CreateTables.sql
Merge branch 'mbs-7205-link-type-cardinality' into schema-change-2014-05

* mbs-7205-link-type-cardinality:
  (fix indentation)
  MBS-7205: update createtables for cardinality
  MBS-7205: add defaulting/not-null behavior to upgrade script
  MBS-7205: absolute bare-minimum schema change