Fibre Channel Zone Manager hacking violations

[Walt Boring]

Some hacking violations have come up after the FCZM landed and need to be addressed. John commented on several of them in the post merge review for this patch.

https://review.openstack.org/#/c/76011

[Walt Boring (walter-boring)]

please fix before RC1

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: master
Review: https://review.openstack.org/79373

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/79373
Committed: https://git.openstack.org/cgit/openstack/cinder/commit/?id=6d9bb4bdc915b1ed6ac9d49012eb185a369cc624
Submitter: Jenkins
Branch: master

commit 6d9bb4bdc915b1ed6ac9d49012eb185a369cc624
Author: Walter A. Boring IV <email address hidden>
Date: Mon Mar 10 10:27:43 2014 -0700

    Fixed some FCZM unit tests hacking issues

    This patch is a follow up to a review that merged
    included and had some issues raised after it was merged.
    This patch includes some hacking cleanup and some
    unit test cleanup for the Fibre Channel Zone Manager.

    Change-Id: Ibb6974b2279f08720c2469893245bc888d35899c
    Closes-Bug: #1285029