Remove 389-ds upgrade state during uninstall

When we perform an upgrade 389-ds is set to listen only on its
ldapi port. Theoretically it should be restored to the previous
state regardless of whether the upgrades were successful or not.

To be sure that a subsequent re-install will be successful go ahead
and remove the state for these options. Think of it as wearing a
belt and suspenders. Otherwise a re-install could return an error
message that IPA is already configured.

https://fedorahosted.org/freeipa/ticket/1667

ipaserver/install/dsinstance.py

@@ -683,6 +683,12 @@ class DsInstance(service.Service):
             except ipautil.CalledProcessError, e:
                 logging.critical("failed to delete user %s" % e)
 
+        # Make sure some upgrade-related state is removed. This could cause
+        # re-installation problems.
+        self.restore_state('nsslapd-port')
+        self.restore_state('nsslapd-security')
+        self.restore_state('nsslapd-ldapiautobind')
+
         if self.restore_state("running"):
             self.start()