Revert "Merge branch 'develop' into osx-installer"

This reverts commit 9b4851c0015847a8c900fe9ecee92b7672ea675c, reversing
changes made to 50c5923d0d19f117f81f43090fc22c02ef667b2e.
Change the order of directory deletes so windows can remove all connector builder files on reboot