Updated openstack/openstack
Project: openstack/neutron  a76af4ade3c751a4372a427989035cf8c32342b0

Some clean up of code I'm preparing to modify

This patch has a few benign changes that should be easily reviewed.
The purpose of this patch is to allow me to make cleaner edits in
follow on patches so that they're more easily reviewed in their
specific contexts.

Change-Id: Ia3dd49c7b39f9ca07d5bb117972d934813c0cd67