ps: code merge

git-svn-id: svn+ssh://kelev.kaltura.com/usr/local/kalsource/backend/server/tags/falcon_2012_08_20@92359 6b8eccd3-e8c5-4e7d-8186-e12b5326b719
add remote_addr_header_salt so mwEmbed will work
up memory to 256M