Bug 5951 - Termination point config reconciliation