Add cleanup for ghost/broken sites dirs leftovers (fixed).
Merge branch 'refs/heads/master' into 2.3.x-dev