Upgrade to Thymeleaf 2.1.4

Closes gh-2215