Fix for KMS-2082
Fix for PLAT-886- Entitlement should be disabled for media server api
calls
Merge branch '2.2.0' into 2.2.1
Merge pull request #6 from kaltura/2.2.1

2.2.1