08e4510746
Fixes bug #1211338 (This is a minimal merge of just oslo-incubator bec54ac5 and no other oslo changes.) Change-Id: I129f9486f13be91868824e0e0534c4760d50589b