#435 - Ensure Thymeleaf configuration loads exclusively via XML
Merge remote-tracking branch 'origin/develop' into cmssplit