Fix for false alarm caused by ghost sites leftovers.
Add cleanup for ghost/broken sites dirs leftovers.
Merge branch 'refs/heads/master' into 2.3.x-dev