DRILL-564: DRILL-442 broke DRILL-433 aka custom column width while printing results
DRILL-565: Spurious insertion into IdentityHashMap in ConstantExpressionIdentifier.visitFloatConstant()
DRILL-494: Filter Pushdown into Scan Operator
json work

Conflicts:
	contrib/storage-hbase/src/main/java/org/apache/drill/exec/store/hbase/HBaseGroupScan.java
intermediate.