ENG-5884: Delete unwanted unloadable generation.
ENG-5884: Delete empty generation directory.
ENG-5884: Print number of files only.
ENG-5884: nullcheck
Merge pull request #1152 from VoltDB/ENG-5884

Eng 5884
ENG-5712 Addressed review concerns and command log recovery.
Merge branch 'master' of github.com:VoltDB/voltdb into ENG-5712
ENG-5712: Fix dumb refactoring that broke inner classes.
ENG-5712: Fix bad prev commit.
Merge branch 'ENG-5712' of github.com:VoltDB/voltdb into ENG-5712
Merge remote-tracking branch 'origin/ENG-5712' into ENG-5711

Conflicts:
	src/frontend/org/voltdb/utils/CatalogUtil.java
	tests/frontend/org/voltdb/utils/TestCatalogUtil.java