sync oslo policy

Related-Bug: 1221889
Change-Id: I0fd0be982879647ef73081326708ec37b1cb9fd9
Merge "sync oslo policy"