Sync with oslo-incubator copy of setup.py

Keep up with the changes to the master copy

Change-Id: I6b87762a25f11c2548cd8df548a217295b8129d4
Merge "Sync with oslo-incubator copy of setup.py"