Fix Ooyala test.
Merge pull request #365 from Wikia/ADEN-1363-3

Fix Ooyala test.
Change external URL and delete Jira label from test nam
Update AdsContent.java
Merge pull request #366 from Wikia/ADEN-1407

Update AdsContent.java
Merge branch 'preview'
ADEN-1320 Basic tests for Krux integration
ADEN-1320 Constants clean-up
ADEN-1320 Using String.format instead of concatenation
Merge pull request #368 from Wikia/aden-1320-basic-test-for-krux-integration

ADEN-1320 Basic tests for Krux integration
ADEN-1363 Fix Ooyala test for VM.
Merge pull request #369 from Wikia/ADEN-1363

ADEN-1363 Fix Ooyala test for VM.
Merge remote-tracking branch 'origin/master' into dev