merge with apache/master and fix conflict
fix according comments and move orc to hive sub project