Fixing test case with orchestrator job - AIRAVATA-1011
refactoring gfac - AIRAVATA-1011
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/airavata