Merge proposals dependent on lp:~openerp-dev/openobject-addons/trunk-website-forum-tpa-imp2-ssh

1. trunk-website-forum-tpa-imp2-ssh
2. Dependent merge proposals