Merge branch 'submoduleFix' into 1.7.x
add SERVLET_CONTEXT_ONLY LocatorStrategy
add unit test for SERVLET_CONTEXT_ONLY use-case
fix merge conflicts
register SERVLET_CONTEXT_ONLY locator in locator provider
fix merge conflicts