Sync with oslo-incubator copy of setup.py and version.py

Keep up with the changes to the master copy

Change-Id: I1cc2ca0e627f25a86b0adc6df9bb9d4a12a3cdcf