Sync with oslo-incubator copy of setup.py

Keep up with the changes to the master copy

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