Merge pull request #1 from clockfly/master

sync from clockfly/gearpump
Merge pull request #2 from intel-hadoop/master

merge with intelhadoop/gearpump
sync with upstream
Merge pull request #1 from gearpump/master

sync