Merge "Fix distribution test trigger on failure"