Fixup of Bug/djpyfs
Merge pull request #4981 from edx/bug/djpyfs

Fixup of Bug/djpyfs