#2168 modified catch clause
#2167 fixed
#2166 added templates and containers dependencies
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