Fixes following testing
Fixes after testing
Merge branch '3.0.0' of https://github.com/kaltura/media-server into 3.3.0-hosted_server_support

Conflicts:
	KalturaMediaServer/src/com/kaltura/media/server/KalturaServer.java
Merge pull request #15 from kaltura/3.3.0-hosted_server_support

3.3.0 hosted server support