ZF-11030 and ZF-10162 commit of Client.php merged with changes by Ramon
ZF-11030 and ZF-10162 commit of Client.php merged with changes by Ramon

git-svn-id: abaeb2b3ba5a94ed391a9405ad7d63d0414021c9@24269 44c647ce-9c0f-0410-b52a-842ac1e357ba

ajgarlag/zf1,ajgarlag/zf1,ajgarlag/zf1,ajgarlag/zf1,ajgarlag/zf1