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

Keep up with the changes to the master copy

Change-Id: Id938cc593a61b56a06c05069034bd958fc6aa8b3