qnd: merges from trunk

git-svn-id: svn+ssh://kelev.kaltura.com/usr/local/kalsource/backend/server/tags/gemini_2013_02_22@94417 6b8eccd3-e8c5-4e7d-8186-e12b5326b719
adding empty directories