[MERGE] packaging: fixing windows installer issues

Purpose:
    * when installing enterprise, postgresql refuse to install if there
    is a '+' char in the install path.
    * when uninstalling, the nssm and python dirs are not removed

setup/package.py

@@ -216,7 +216,7 @@ class KVM(object):
 class KVMWinBuildExe(KVM):
     def run(self):
         with open(join(self.o.build_dir, 'setup/win32/Makefile.version'), 'w') as f:
-            f.write("VERSION=%s\n" % version.replace('~', '_'))
+            f.write("VERSION=%s\n" % version.replace('~', '_').replace('+', ''))
         with open(join(self.o.build_dir, 'setup/win32/Makefile.python'), 'w') as f:
             f.write("PYTHON_VERSION=%s\n" % self.o.vm_winxp_python_version.replace('.', ''))
         with open(join(self.o.build_dir, 'setup/win32/Makefile.servicename'), 'w') as f:

setup/win32/setup.nsi

@@ -312,6 +312,8 @@ Section "Uninstall"
 
     Rmdir /r "$INSTDIR\server"
     Rmdir /r "$INSTDIR\thirdparty"
+    Rmdir /r "$INSTDIR\python"
+    Rmdir /r "$INSTDIR\nssm"
     DeleteRegKey HKLM "${UNINSTALL_REGISTRY_KEY}"
 SectionEnd