Clean up class loading problem with the ServletContainerInitializer
Merge pull request #1114 from stuartwdouglas/master

Clean up class loading problem with the ServletContainerInitializer