Fix for the broken dvcs test

Only emit jobIsReady when there is no error, and if there is an error
let it emit the emitResult itself.
Merge remote-tracking branch 'origin/1.6'
Fix compilation with strict iterators