Set the log4j version to 1.2.17 (prevent duplicate log4j jars)

Added back missing patches/merge problems.

CSD-ified version

Merge pull request alteryx#18 from markhamstra/shark-0.9-csd

Syncing Hive up with AMPLab Hive

Merge pull request alteryx#17 from mbautin/shark-0.9-csd_fix_fetch_op…

…erator

Sort file splits in FetchOperator

Merge pull request alteryx#14 from jhartlaub/shark-0.9-csd

Applied patch https://issues.apache.org/jira/browse/HIVE-2332

Bump the version pre-build.

Merge pull request alteryx#13 from markhamstra/shark-0.9-csd

Merging AMPLab commits

Merge pull request alteryx#12 from markhamstra/shark-0.9-csd

Syncing dependencies with hbase

Merge pull request alteryx#11 from mbautin/shark-0.9-csd-test-fixes

Making Hive tests more stable