Improve multi-languages portal homepage edition and merge with private links - refs #6064
Merge remote-tracking branch 'origin/1.9.x' into 1.9.x