Fix problem with retry of mcollective tasks

* Fix problem with retry of mcollective tasks;
* Fix test to detect such behavior in future.

Change-Id: I5ee77caf9d9754415a636283d238e1bbc33d1b16
Related-Bug: #1268701
Closes-Bug: #1273772