Please review this patch which addresses the following ticket:
PKI TRAC Ticket #2431 - Errors noticed during ipa server upgrade.
-- Matt