83b781ae4f
Recent setuptools include updated vendored pkg_resource that changed the exception that we need to expect from them. Leave in the old version, too, for backwards compatibility. Change-Id: I5bb01fb21982fb8757e925659ad206a15a79f799