AIRAVATA-1121
AIRAVATA-1124
AIRAVATA-1124
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/airavata