Updated JavaScript casing and JsHelper references in doc blocks
Updated Controller:: doc block and ControllerMergeVarsTest::
Merge pull request #1681 from bcrowe/hotfix-camelcasejs

Updated JavaScript in doc blocks and helper references