Fix for incremental backup
code cleanups for incremental patches
Merge pull request #376 from romses/master

Missing commits for incremental patches