merge updated openstack work from my own repo.
merge completely stupid, trivial conflicts all due to whitespace