Note that @IntegrationTest and @WebAppConfiguration can be used with Spock

Closes gh-1908
Merge branch '1.1.x'