AIRAVATA-433 + fix client sample issue