fixng AIRAVATA-942, no scheduling activity is there in gfac at this point
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/airavata
Fixing a NPE during error scenario and fixing the code to show proper error message
removing duplicated airavata-server.properties, AIRAVATA-1004