fixing issues with job monitor - AIRAVATA-1027
https://issues.apache.org/jira/browse/AIRAVATA-1046
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/airavata
fixing build error
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/airavata