[MRG] Automatic merge, branches/12.x 50677 to 50679 Conflicts in templates/tiki-install.tpl fixed manually. Please test as I don't have a multi-tiki installation and disturbingly it seems like some previous 12.x changes never made it in (now added in this commit). Please note any change to tiki-install.tpl in 12.x will almost certainly need to be manually merged due to significant refactoring of this file in trunk with r49550 before the security fixes started.
[MRG] Automatic merge, branches/12.x 50677 to 50679
Conflicts in templates/tiki-install.tpl fixed manually.
Please test as I don't have a multi-tiki installation and disturbingly it seems like some previous 12.x changes never made it in (now added in this commit).
Please note any change to tiki-install.tpl in 12.x will almost certainly need to be manually merged due to significant refactoring of this file in trunk with r49550 before the security fixes started.

git-svn-id: a7fabbc6a7c54ea5c67cbd16bd322330fd10cc35@50681 b456876b-0849-0410-b77d-98878d47e9d5

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