updating superproj links to submodules
updating superproj links to submodules
Merge branch 'master' into feature/ozp-798-jaas-security
Merge branch 'feature/ozp-798-spring-security' into feature/ozp-798-jaas-security

Conflicts:
	bundles/client/legacy/src/main/webapp/WEB-INF/web.xml
OZP-798 : Updated parent module