drill

ac823fe8 - DRILL-2221: Do not skip writing an empty list

DRILL-2221: Do not skip writing an empty list small fix for bad resolution of merge conflict in free marker template Fix test to use dfs_test instead of the default dfs storage plugin