Merge "Fix test 104 for --relocate --no-patchoat"