Mapped file config option always appears in the info file.
Added javadoc comments.
Delete old data files before beginning snapshot restore.
Use long constants for timeouts, preventing incorrect binding to int hash parameter.
Merge remote-tracking branch 'remotes/origin/master' into compact