Reapply reverted commits for dbf-related changes.

Change-Id: I943afed72e66915849c65b7e01ba0e6192ba0d33
Possible fix to null pointer bug
improved debug printing
fixed bugs with dbf file list and column uniqueness checking