(cherry-picked from https://svn.forgerock.org/openidm/branches/upgrade



git-svn-id: https://svn.forgerock.org/openidm/trunk@5280 d98387aa-ee2c-4292-a9e6-504d2a719fd3