https://issues.apache.org/jira/browse/AIRAVATA-1301 + introducing integration tests
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/airavata