BIGTOP-1435. Fix Crunch build after BIGTOP-1429
BIGTOP-1433. Fix Hive build after BIGTOP-1429