Sync with oslo-incubator.

Up to date as of 575e74d352d685773513218a286979bb58920246.

Change-Id: I302bd832fdd4ee6a325b600aceba525b109bb4e1
Fix IBM copyright strings

Update IBM copyright strings to one consistant format

Change-Id: I009fc8f06c1e67295a14d43aa5ed4c84399f1438
Merge "Sync with oslo-incubator."
Merge "Fix IBM copyright strings"