Resync the latest oslo code.

Change-Id: Ia9a6ce983e01542f4f0f7601f9b2ae2aedd1ae34