Merge "Fail fast on persistent failure" into jb-mr1-dev