Merge branch 'master' of https://github.com/openstack/marconi into Pecan
Merge branch 'pecanish' of https://github.com/cabrera/marconi into cabrera-pecanish

Conflicts:
	marconi/queues/transport/pecan/driver.py
	setup.cfg
Merge branch 'cabrera-pecanish' into Pecan