Fix incorrect discovery of non-test `__init__.py` files.#6197

asottile merged 2 commits intopytest-dev:masterpytest-dev/pytest:masterfrom

asottile:fix_init_py_discoveryCopy head branch name to clipboard