sync oslo

this patch also corrects an issue where we incorrectly referenced
common._i18n

this patch syncs to: Ia1820495a989f4f84530ab83f2d87d53a9f761df

Change-Id: Ia192869d7e92732000b9033b09b97316ba5d5028
Merge "sync oslo"