Merge from oslo-incubator

Change-Id: Ie5d9d2c1938e58125b58e64a3363f1e1e8ce2ba2
Imported Translations from Transifex

Change-Id: Idadd30ca29eaf2da44c670722060b28ad8028c4a
Merge "Merge from oslo-incubator"
Merge "Imported Translations from Transifex"