FIX: consider only submitted tasks for updating status
Conflicts resolved
Merge pull request #1742 from atsareg/resolve-v6r10

Resolve conflicts in #1741