Fix --help/--version when conftest imports models#1275

brianhelba wants to merge 2 commits intopytest-dev:mainpytest-dev/pytest-django:mainfrom

brianhelba:help-conftestbrianhelba/pytest-django:help-conftestCopy head branch name to clipboard