Update import location of `prefer_xmodules`
Merge branch 'xblock-prefer' into xblock-mentoring-optionalapp-fix