More refactoring of portal views - move mainContent wrapper into core to share more widely
Merge branch 'master' into merge_guides