fix: test failures introduced by the openstack merge

Squashed commit of the following:

commit e6353dbe1708d62fec0adb891a7be7223b861058
Author: Chris Howe <howech@infochimps.com>
Date:   Mon Mar 17 13:41:56 2014 -0500

    Hierarchical security groups now live on compute objects, not cloud objects.

    Change-Id: I0249841691c51598d81f14ac96a28303e8e50141

Change-Id: I86ee4bc42239b619f5bf3a8a0d838bbb02acbf72