Updated openstack/openstack
Project: openstack/nova  642fa9e805c39a22d6ff409f5e1f1e967aa18298

Fix duplicate definitions of variables/methods

Found these with a static analysis tool. Removed a bad
cut-n-paste of 2 test methods. Changed test method names
slightly to ensure they run

Change-Id: I15a90d0447e8038683a36766138d8db088cb4136