Sync gettextutils from oslo

Some Messages use a Message within a Message, and we were only
translating the base Message but not the Message substitution within.

Fixes bug: #1221808

Change-Id: Ic3119df23a090cfaa160c1461e955f0af55fe1cf
Merge "Sync gettextutils from oslo"