SEC-1953: Polish bundlor warnings

config/template.mf

@@ -10,20 +10,28 @@ Ignored-Existing-Headers:
  Export-Package
 Import-Template:
  org.apache.commons.logging.*;version="${cloggingRange}",
+ org.aopalliance.*;version="${aopAllianceRange}";resolution:=optional,
  org.aspectj.*;version="${aspectjRange}";resolution:=optional,
  org.springframework.security.access.*;version="${secRange}",
  org.springframework.security.authentication.*;version="${secRange}",
  org.springframework.security.core.*;version="${secRange}",
  org.springframework.security.crypto.bcrypt.*;version="${secRange}",
+ org.springframework.security.crypto.password.*;version="${secRange}",
  org.springframework.security.util;version="${secRange}",
  org.springframework.security.provisioning;version="${secRange}",
  org.springframework.security.web.*;version="${secRange}";resolution:=optional,
+ org.springframework.security.ldap.*;version="${secRange}";resolution:=optional,
+ org.springframework.security.openid.*;version="${secRange}";resolution:=optional,
+ org.springframework.ldap.*;version="${springLdapRange}";resolution:=optional,
  org.springframework.aop.*;version="${springRange}";resolution:=optional,
+ org.springframework.jdbc.*;version="${springRange}";resolution:=optional,
+ org.springframework.http.*;version="${springRange}";resolution:=optional,
  org.springframework.beans.*;version="${springRange}",
  org.springframework.context.*;version="${springRange}",
  org.springframework.core.*;version="${springRange}",
  org.springframework.web.*;version="${springRange}",
  org.springframework.util.*;version="${springRange}",
  javax.servlet.*;version="0";resolution:=optional,
+ org.openid4java.*;version="${openid4javaRange}",
  javax.naming.directory;version="0";resolution:=optional,
  org.w3c.dom;version="0";resolution:=optional

web/template.mf

@@ -34,6 +34,7 @@ Import-Template:
  org.springframework.http.*;version="${springRange}",
  org.springframework.jdbc.*;version="${springRange}";resolution:=optional,
  org.springframework.mock.web;version="${springRange}";resolution:=optional,
+ org.springframework.web.*;version="${springRange}";resolution:=optional,
  org.springframework.web.context.*;version="${springRange}";resolution:=optional,
  org.springframework.web.filter.*;version="${springRange}",
  org.springframework.util;version="${springRange}";resolution:=optional,