TDI-30091 : Errors would pop when user open remote project P1 which has
updated in its offline mode before and cancel committing them
Merge branch 'maintenance/5.6'