Merge "Show more info when a testcase fails." into jb-mr1-dev