Server 4.1.5 upgrade on 10.10.5 lost users/computers

I lost all of my non-local server users (and computers) from my OpenDirectory after rebooting after installing 4.1.5 after installing 10.10.5

After installing 10.10.5 users were there, and then installed Server 4.1.5 and ran the Server tool to "update" server, and now my Open Directory users are gone:

I tried to restore the Open Directory from an archive from a few weeks ago and I received an error Exception below. I checked the Setup log for Server and it shows nothing related to errors for LDAP or OpenDirectory, just the same message I got in April when I last upgraded.

Has anyone else lost users?

Setup (from last April and yesterday):

Apr 9 12:44:06.961 Applying OpenLDAPCookieRemoval<7fc480d65280> Reset OpenLDAP restore state.

Apr 9 12:44:06.961 OpenLDAPCookieRemoval<7fc480d65280> Running 'rm -f /var/db/openldap/migration/.ODRestoreCompleted'

Apr 9 12:44:07.049 OpenLDAPCookieRemoval<7fc480d65280> 'rm' succeeded [87.893009 ms]

Apr 9 12:44:07.049 Finished applying OpenLDAPCookieRemoval<7fc480d65280> Reset OpenLDAP restore state.

Sep 3 08:40:16.774 Applying OpenLDAPCookieRemoval<7fe8c9420130> Reset OpenLDAP restore state.

Sep 3 08:40:16.774 OpenLDAPCookieRemoval<7fe8c9420130> Running 'rm -f /var/db/openldap/migration/.ODRestoreCompleted'

Sep 3 08:40:16.902 OpenLDAPCookieRemoval<7fe8c9420130> 'rm' succeeded [127.154946 ms]

Sep 3 08:40:16.902 Finished applying OpenLDAPCookieRemoval<7fe8c9420130> Reset OpenLDAP restore state.

Exception:

2015-09-04 02:16:03 +0000 command: /usr/bin/ldapsearch -x -LLL -H ldapi://%2Fvar%2Frun%2Fldapi -b cn=config olcDatabase={1}bdb olcDbIndex

2015-09-04 02:16:03 +0000 command: /usr/bin/ldapmodify -c -x -H ldapi://%2Fvar%2Frun%2Fldapi

modifying entry "olcDatabase={1}bdb,cn=config"

ldap_modify: Other (e.g., implementation specific) error (80)

additional info: index type "apple-locale-subnets" undefined

2015-09-04 02:16:03 +0000 Removed directory at path /var/db/krb5kdc/temp.

2015-09-04 02:16:03 +0000 Removed directory at path /tmp/slapconfig_stage4252P6x613.

2015-09-04 02:16:03 +0000 command: /usr/bin/hdiutil detach disk3

2015-09-04 02:16:03 +0000 Removed file at path /var/run/slapconfig.lock.