In this changeset, I do some tidy up so I can later on make it easier to refactor the lot. Partially Implements: blueprint openstackclient-plugin Change-Id: I566101fb951b9489481a3e6c1a4008c80b14f6fd
Change-Id: Ifecc2c7dd6bd859ba6ef327fddd891982382df3b