Delete orphaned directories from upstream rename.
These directories should have been renamed/deleted in
which was merged into developers-dev at commit:
The automerger did something strange when generating this
merge, and it seems that the files were copied without a
corresponding delete, and only in this branch.
Deleting them again to rectify branch state.
42 files changed