On import, don't move the course into the course_dir but just
do the import from wherever it unpacked.
Avoids an exception where the top-level dir had a subdir of same name
as one being moved, but also just makes it faster.
Merge pull request #4440 from edx/bug/import

Bug/import