Merge pull request #21795 from jefferyto/python-netdisco-3.0.0