[IMP] form views: remove sheets in config forms

(Closes #850)
Merge branch 'master' of https://github.com/odoo/odoo into master-linux64