PLAT-2102 - fixed failover issue
Merge branch '3.1.0' into 3.1.3

Conflicts:
	KalturaMediaServer/src/com/kaltura/media/server/VERSION.txt
Merge pull request #67 from kaltura/3.1.3

3.1.3