Improve ProgressData reporting.
Add file conflict detection during commit (bnc#673720)