#2147 added permissions to the content search
#2147
Merge remote-tracking branch 'origin/master' into issue-2147-remote-pub-portlet-permissions
#2147 added permission check on contents
fixes #1919
#1545 added code to make dotcms as external content repository for Liferay
#1545 added code to make dotcms as external content repository for Liferay
Merge pull request #2155 from dotCMS/issue-1919-forms-validation-localization-grammar-errors

fixes #1919
Merge pull request #2157 from dotCMS/issue-1545-dotcms-cmis-as-external-content-repo

Issue 1545 dotcms cmis as external content repo
#2159 working on getting incremental on timemachine
fixes #2104
#2159
Merge pull request #2162 from dotCMS/issue-2104-tail-log-popup-iframe-height

fixes #2104
#2168 modified catch clause
#2167 fixed
#2166 added templates and containers dependencies
Merge pull request #2165 from dotCMS/issue-2159-timemachine-incremental

Issue 2159 timemachine incremental -
Merge pull request #2169 from dotCMS/issue-2166-html-template-dependencies

Issue 2166 html template dependencies

This branch was branched from another fix branch, which is why it contains multiple commits (the same commits are on other branches).  The important commit is ece00f5
stub for #2098, which broke with the cmis commit
#2098 stub that doesn't fail #2154