conpaas-client: revert changes introduced in r4765 as they break the functional tests
conpaas-client: revert changes introduced in r4765 as they break the functional tests


ConPaaS-team/conpaas,ConPaaS-team/conpaas,ConPaaS-team/conpaas,ConPaaS-team/conpaas,ConPaaS-team/conpaas,ConPaaS-team/conpaas,ConPaaS-team/conpaas