Backport of r31186 and 30586 made in trunk to attempt to update plugin info in 6x without causing merge conflicts. I'll roll back if it doesn't work.
Backport of r31186 and 30586 made in trunk to attempt to update plugin info in 6x without causing merge conflicts. I'll roll back if it doesn't work.

git-svn-id: 9bac41f8ebc9458fc3e28d41abfab39641e8bd1c@31187 b456876b-0849-0410-b77d-98878d47e9d5

changi67/tiki,changi67/tiki,tikiorg/tiki,oregional/tiki,changi67/tiki,tikiorg/tiki,oregional/tiki,changi67/tiki,oregional/tiki,tikiorg/tiki,changi67/tiki,oregional/tiki,tikiorg/tiki