fixing AIRAVATA-1011
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/airavata
reading thrift version from a property in parent pom
Merge remote-tracking branch 'origin/master'
updating directory paths