made disk format version upgrade less scary #945

fixes #945
Merge branch 'bugfixes/tokumx-1.4'