MBS-5528: Rename short_link_phrase to long_link_phrase
MBS-5528: Use long_link_phrase in po/extract_pot_db
Merge branch 'mbs-5528' into schema-changes-2013-05-15

* mbs-5528:
  MBS-5528: Use long_link_phrase in po/extract_pot_db
  MBS-5528: Rename short_link_phrase to long_link_phrase

Conflicts:
	upgrade.sh