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

Keep up with the changes to the master copy

Change-Id: I24522c7de91c2dea0f7e4b8cac2a27ff162df7f1