Differentiate two level of layout ('container_layout' and 'content_layout' instead of 'layout' only) (JPS)

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@8787 20353a03-c40f-0410-a6d1-a30d3c3de9de