WINK-356 - Applying patch from Gentaro Oka to fix issue around guice server when custom application class was in use