have XModuleDescriptor properly ensure category is set
Merge branch 'fix/cdodge/unicode-error-in-video-xml-serilization' of github.com:edx/edx-platform into fix/cdodge/unicode-error-in-video-xml-serilization