AIRAVATA-2521 Some pull requests fixes
3 files changed