Merge #14971: Use class method name, not function.__name__, during unittest discovery.