Rearranging orchestrator code AIRAVATA-1011
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/airavata
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/airavata
fixing build failure
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/airavata
more code for AIRAVATA-1011