composite dir regen includes empty folders and breaks p2

When we regen composite sites automatically, it includes subfolders but doesn't check if those folders are empty; so we should remove children if they're empty, and delete the folders too.

We could also ensure that the child folder contains a folder that matches the ${childFolderSuffix} (often /all/repo/).