Fix failing ThymeleafAutoConfigurationTests

Remove accidental addition of a 1.2 test.
Merge branch '1.1.x'
Restore ThymeleafAutoConfiguration test

Restore the test removed during the merge.