[MERGE] forward port of branch saas-3 up to 2f4be42

diff --cc addons/web/static/src/js/view_form.js
Simple merge

diff --cc addons/web_kanban/static/src/js/kanban.js
Simple merge

diff --cc addons/website/controllers/main.py
Simple merge

diff --cc openerp/tools/yaml_import.py
Simple merge