Merge pull request #1537 from edx/will/fix-unicode-vagrant-issue

Fixed test that was failing in Vagrant due to filesystem encoding mismatch

common/lib/xmodule/xmodule/tests/test_import.py

@@ -385,7 +385,7 @@ class ImportTestCase(BaseCourseTestCase):
         print("course errors:")
 
         # Expect to find an error/exception about characters in "®esources"
-        expect = "Invalid characters in '®esources'"
+        expect = "Invalid characters"
         errors = [(msg.encode("utf-8"), err.encode("utf-8"))
                     for msg, err in
                     modulestore.get_item_errors(course.location)]