Merge "Use oslo.config-1.1.0b1"