Merge "Provide more info for bsdiff/imgdiff exceptions."