Fixed AIRAVATA-1371 and AIRAVATA-1367.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/airavata