Update Page.content_panels with current field defs
Merge branch 'master' into feature/taavi-design-updates