Upgrade to 3.6.0 from 3.4.1 breaks LDAP

After an upgrade from 3.4.1 to 3.6.0, things worked fine. Then once I tried to modify the LDAP settings, the BaseDN is no longer valid when used through either the setup or admin interface. I get something like this:

Test: Connection Settings

Status: Error

Invalid DN syntax or naming violation.

The settings are the same as I see in my backed up openfire.xml. The BaseDN field is in the format of:

dc=companyname,dc=com
…and is what I have in my old openfire.xml file:

<baseDN>dc=companyname,dc=com</baseDN>

I’ve checked with JXPlorer, the LDAP tool, and it lists the above settings as a NamingContext, so it doesn’t look like my ldap server changed coincidentally.

Trying to use the old openfire.xml file no longer works either.

Which table are these settings held in the database? Any suggestions of how to workaround this?

Thanks!