Sync with oslo-incubator copy of setup.py

Keep up with the changes to the master copy

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