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