fixes #6801
#6797: Adding missing bracket
closes #6742
Merge pull request #6802 from dotCMS/issue-6801-move-cache-ttl-first-tab-on-3.1

fixes #6801
#6201: Test not compiling
Merge remote-tracking branch 'origin/master-3.1' into issue-6806-allow-index.html-as-homepage
#6806 added validation in ContentletAPI for htmlpages