Fix flaky video test #21: increase timeout.
Merge pull request #3201 from edx/alex/fix_971

Fix flaky video test #21: increase timeout.
BLD-958: Force video player in flash mode.