more changes for integration - AIRAVATA-1028