MBS-5929: Schema changes for relationship documentation
Merge branch 'mbs-5929' into schema-changes-2013-05-15

* mbs-5929:
  MBS-5929: Schema changes for relationship documentation

Conflicts:
	upgrade.sh