Upgrade 18.3 to 19.1 Spring file merging - tomcat start-up failing with this error

Hi,

Spring files were working well with 18.3 those were merged with existing files from 18.2. Now with 19.1 same files were merged. Tomcat start up is failing with this error. Is there anything that got changed with 19.1 which is causing tomcat start-up to fail.

Caused by: java.lang.RuntimeException: org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'org.springframework.security.filterChains': Cannot resolve reference to bean 'org.springframework.security.web.DefaultSecurityFilterChain#54' while setting bean property 'sourceList' with key [54]; nested exception is org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'org.springframework.security.web.DefaultSecurityFilterChain#54': Cannot resolve reference to bean 'apiKeyFilter' while setting constructor argument with key [5]; nested exception is org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'apiKeyFilter' defined in class path resource [com/appiancorp/apikey/ApiKeyFilterSpringConfig.class]: Unsatisfied dependency expressed through method 'apiKeyFilter' parameter 1; nested exception is org.springframework.beans.factory.NoUniqueBeanDefinitionException: No qualifying bean of type 'org.springframework.security.web.AuthenticationEntryPoint' available: expected single matching bean but found 2: httpBasicAuthenticationEntryPoint,forbiddenEntryPoint