Ported in Co-authored-by support from oslo.

Change-Id: I2db5b4f22f24686ada7c40fad2da134403812675