Merge "Clean distribution test job"