Fixed tags to match optimizzation tests
Merge branch 'IX-live-1.1' of https://github.com/kaltura/server into IX-live-1.1

Conflicts:
	deployment/base/scripts/init_data/04.liveParams.ini