fixing build failure in JDK6
Merge branch 'master' of https://github.com/wso2/carbon-data