HIVE-7068 Fix dependency ordering, remove unnecessary version definitions
HIVE-7068 Right a check to make sure we compensate for the Accumulo bug.