FLUID-4787: Fixing multiple issues here. First fixing a typo. Secondly now captions should be off be default. And lastly Safari will have default captions turned off be default.
FLUID-4787: Added tests to check that captions are not present in HTML when displayCaptions is set to false and also when some of the options are missing. Also revamped tests.
FLUID-4787: Added a comment to show that some of the tests should be ran from localhost
FLUID-4787: Fixed comments. Removed extra comments. Removed multiline vars and using single line ones instead. Put a setupEnvironment function into testUtils. Renamed html5 featore to be supportHtml5
FLUID-4787: First steps towards interim step for creating a configurable test enviornment
Merge branch 'demo' into FLUID-4787

Conflicts:
	js/VideoPlayer_html5Captionator.js
	tests/html/TestCaptions.en.vtt
	tests/html/TestCaptions.fr.vtt
	tests/js/VideoPlayerHTML5CaptionatorTests.js
FLUID-4787: Clean up after merge conflict resolution.
Merge branch 'demo' into FLUID-4787

Conflicts:
	tests/html/VideoPlayerHTML5Captionator-test.html
	tests/js/VideoPlayerControlsTests.js
	tests/js/VideoPlayerHTML5CaptionatorTests.js

Still a couple of tests failing.
FLUID-4787: Fixing a merge bug and an unfortunately corresponding merge bug in the test.
FLUID-4787: Changing the naming and structure of the test utilities function which runs tests with an environment.
FLUID-4787: Generalizing the implementation of setStaticEnv and cleanupEnv.
FLUID-4787: Removing setupTestEnvironmentFeature in favour of setStaticEnv and cleanupEnv
FLUID-4787: Slight cleanup of the testInit function.
FLUID-4787: Renaming 'cleanupEnv' to 'clearStaticEnv' for consistency. Adding 'async' flag to testCaseWithEnv for individual tests.
FLUID-4787: Changing the testCaseWithEnv implementation so that setup and teardown use the same strategy.
Merge branch 'master' into FLUID-4787

Conflicts:
	js/VideoPlayer.js
	tests/js/VideoPlayerHTML5CaptionatorTests.js
FLUID-4787: Finish some of the refactoring.
Merge remote-tracking branch 'acheetham/FLUID-4787'

* acheetham/FLUID-4787:
  FLUID-4787: Finish some of the refactoring.
  FLUID-4787: Changing the testCaseWithEnv implementation so that setup and teardown use the same strategy.
  FLUID-4787: Renaming 'cleanupEnv' to 'clearStaticEnv' for consistency. Adding 'async' flag to testCaseWithEnv for individual tests.
  FLUID-4787: Slight cleanup of the testInit function.
  FLUID-4787: Removing setupTestEnvironmentFeature in favour of setStaticEnv and cleanupEnv
  FLUID-4787: Generalizing the implementation of setStaticEnv and cleanupEnv.
  FLUID-4787: Changing the naming and structure of the test utilities function which runs tests with an environment.
  FLUID-4787: Fixing a merge bug and an unfortunately corresponding merge bug in the test.
  FLUID-4787: Clean up after merge conflict resolution.
  FLUID-4787: First steps towards interim step for creating a configurable test enviornment
  FLUID-4787: Fixed comments. Removed extra comments. Removed multiline vars and using single line ones instead. Put a setupEnvironment function into testUtils. Renamed html5 featore to be supportHtml5
  FLUID-4787: Added a comment to show that some of the tests should be ran from localhost
  FLUID-4787: Added tests to check that captions are not present in HTML when displayCaptions is set to false and also when some of the options are missing. Also revamped tests.
  FLUID-4787: Fixing multiple issues here. First fixing a typo. Secondly now captions should be off be default. And lastly Safari will have default captions turned off be default.