Sync minor updates in oslo

* vim headers removed
* six used in corresponding places
* uuidutils usages removed
* some very minor improvements

Change-Id: I4ae7bde1f1019d0b676ab7a259ac9108e2e458cc
Merge "Sync minor updates in oslo"