25c9322966
Ran the oslo-incubator sync script and brought across only the files that have small and safe changes. Change-Id: I41b400c189e52a2e7f642a03ad143d821aaa807c