Fix incorrect video bok choy test.
Merge pull request #4083 from edx/alex/fix_syntax_error_in_video_player_test

Fix incorrect video bok choy test.
Allow xblocks to be added as advanced problem types
Add unit tests and fix component ordering
Fix logic for determining primary blank template.
Fixes for Christina's review comments.