Sync with oslo-incubator rev fa785cea

oslo.policy has been kept back again

Change-Id: I05c3defdf5e210bebfcecb7f5ba17cec7217ece8
Merge "Sync with oslo-incubator rev fa785cea"