Unable to upgrade 3.1 to 3.5.13. Validation fails on userSearchFilter and groupSearchFilter in atlassian-user.xml

Trying to upgrade Confluence 3.1 to 3.513 as pre-cursor to upgrading to 4.2
Getting this exception:

2012-04-26 16:37:19,512 ERROR [main] [confluence.user.migration.LdapRepositoryConfigurationMigrator] validateObjectClassDefined Property groupSearchFilter does not define an objectClass filter
2012-04-26 16:37:19,543 ERROR [main] [confluence.user.migration.LdapRepositoryConfigurationMigrator] validateObjectClassDefined Property userSearchFilter does not define an objectClass filter
2012-04-26 16:37:19,547 INFO [main] [confluence.user.migration.AtlassianUserMigrator] validate validated repository [ ldapRepository ] with [ com.atlassian.confluence.user.migration.LdapRepositoryConfigurationMigrator@2e98f864 ]
2012-04-26 16:37:19,550 INFO [main] [confluence.user.migration.AtlassianUserMigrator] validate validated repository [ hibernateRepository ] with [ com.atlassian.confluence.user.migration.HibernateRepositoryConfigurationMigrator@3cdb8522 ]
2012-04-26 16:37:19,694 ERROR [main] [atlassian.confluence.upgrade.UpgradeLauncherServletContextListener] contextInitialized Upgrade failed, application will not start: Upgrade task com.atlassian.confluence.upgrade.upgradetask.AtlassianUserToEmbeddedCrowdConfigurationUpgradeTask@2f823290 failed during the VALIDATION phase
com.atlassian.confluence.upgrade.UpgradeException: Upgrade task com.atlassian.confluence.upgrade.upgradetask.AtlassianUserToEmbeddedCrowdConfigurationUpgradeTask@2f823290 failed during the VALIDATION phase
at com.atlassian.confluence.upgrade.AbstractUpgradeManager.executeUpgradeStep(AbstractUpgradeManager.java:205)
at com.atlassian.confluence.upgrade.AbstractUpgradeManager.validateUpgradeTasks(AbstractUpgradeManager.java:140)
at com.atlassian.confluence.upgrade.AbstractUpgradeManager.upgrade(AbstractUpgradeManager.java:70)
at com.atlassian.confluence.upgrade.impl.DefaultUpgradeManager.upgrade(DefaultUpgradeManager.java:140)
at com.atlassian.confluence.upgrade.UpgradeLauncherServletContextListener.contextInitialized(UpgradeLauncherServletContextListener.java:28)
at org.apache.catalina.core.StandardContext.listenerStart(StandardContext.java:4135)
at org.apache.catalina.core.StandardContext.start(StandardContext.java:4630)
at org.apache.catalina.core.ContainerBase.addChildInternal(ContainerBase.java:791)
at org.apache.catalina.core.ContainerBase.addChild(ContainerBase.java:771)
at org.apache.catalina.core.StandardHost.addChild(StandardHost.java:546)
at org.apache.catalina.startup.HostConfig.deployWAR(HostConfig.java:905)
at org.apache.catalina.startup.HostConfig.deployWARs(HostConfig.java:740)
at org.apache.catalina.startup.HostConfig.deployApps(HostConfig.java:500)
at org.apache.catalina.startup.HostConfig.start(HostConfig.java:1277)
at org.apache.catalina.startup.HostConfig.lifecycleEvent(HostConfig.java:321)
at org.apache.catalina.util.LifecycleSupport.fireLifecycleEvent(LifecycleSupport.java:119)
at org.apache.catalina.core.ContainerBase.start(ContainerBase.java:1053)
at org.apache.catalina.core.StandardHost.start(StandardHost.java:785)
at org.apache.catalina.core.ContainerBase.start(ContainerBase.java:1045)
at org.apache.catalina.core.StandardEngine.start(StandardEngine.java:445)
at org.apache.catalina.core.StandardService.start(StandardService.java:519)
at org.apache.catalina.core.StandardServer.start(StandardServer.java:710)
at org.apache.catalina.startup.Catalina.start(Catalina.java:581)
at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39)
at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25)
at java.lang.reflect.Method.invoke(Method.java:597)
at org.apache.catalina.startup.Bootstrap.start(Bootstrap.java:289)
at org.apache.catalina.startup.Bootstrap.main(Bootstrap.java:414)
2012-04-26 16:37:19,742 ERROR [main] [atlassian.confluence.upgrade.UpgradeLauncherServletContextListener] contextInitialized 2 errors were encountered during upgrade:
2012-04-26 16:37:19,745 ERROR [main] [atlassian.confluence.upgrade.UpgradeLauncherServletContextListener] contextInitialized 1: Property groupSearchFilter does not define an objectClass filter
2012-04-26 16:37:19,748 ERROR [main] [atlassian.confluence.upgrade.UpgradeLauncherServletContextListener] contextInitialized 2: Property userSearchFilter does not define an objectClass filter

here is our atlassian-user.xml. We've been using it with 3.1 for the past 2 years.

<atlassian-user>
<repositories>
<ldap key="ldapRepository" name="LDAP Repository@hecate.atlassian.com" cache="true">
<host>*****.bcbsa.com</host>
<port>****</port>
<securityPrincipal>uid=*****,ou=Pseudo Accounts, ou=Global, dc=bcbsa,dc=com</securityPrincipal>
<securityCredential>******</securityCredential>
<securityProtocol>plain</securityProtocol>
<securityAuthentication>simple</securityAuthentication>
<baseContext>dc=bcbsa,dc=com</baseContext>
<baseUserNamespace>ou=people,ou=bcbs,dc=bcbsa,dc=com</baseUserNamespace>
<baseGroupNamespace>ou=orgs,ou=bcbs,dc=bcbsa,dc=com</baseGroupNamespace>
<usernameAttribute>uid</usernameAttribute>
<userSearchFilter>(objectClass=inetorgperson)</userSearchFilter>
<firstnameAttribute>givenName</firstnameAttribute>
<surnameAttribute>sn</surnameAttribute>
<emailAttribute>mail</emailAttribute>
<groupnameAttribute>o</groupnameAttribute>
<groupSearchFilter>(objectclass=bcbsorganization1)</groupSearchFilter> <!-dummy value to not load orgs as groups->
<membershipAttribute>uniqueMember</membershipAttribute>
<userSearchAllDepths>false</userSearchAllDepths>
<groupSearchAllDepths>false</groupSearchAllDepths>
</ldap>
<hibernate name="Hibernate Repository" key="hibernateRepository" description="Hibernate Repository" cache="true" />
</repositories>
</atlassian-user>