NATIVE-13, merge the code from patch/hadoop to trunk
Merge branch 'master' of https://github.com/clockfly/nativetask