Allow use of oslo.messaging 1.2.0a6

A handful of pretty minor fixes since a5, but needed for Nova.

Change-Id: I291403972850b672d94ed95d9372ef009b4619b5