More fixes with integration - AIRAVATA-1028
fixing issue during integration test - AIRAVATA-1028