Correct reference to ConfigurableEmbeddedServletContainerFactory

Closes gh-1500
Merge branch '1.1.x'