Clean up local variable usage - Heat

Change-Id: Ia912a8d3ea764dc713e8fdc380175ab98f887a60
Clean up local variable usage - Ironic

Change-Id: I7a455299c6aa079de02b75d4d53df43074880ff7
Revert "cleanup potentially installed older oslo.config"

Icehouse is for long behind our back, so let's remove that hack.

Conflicts:
	lib/oslo

This reverts commit db5fadb5cb768820df54fc3d1c7428a57b511582.

Change-Id: I06d3b0a8779ba51e05c439832ef3b7dbdc97ded1
Merge "Clean up local variable usage - Ironic"
Merge "Clean up local variable usage - Heat"
Merge "Revert "cleanup potentially installed older oslo.config""
Merge commit 'refs/changes/83/86083/2' of git://gold.eng.hq.xensource.com/git/github/openstack-dev/devstack into tmpbranch
Merge commit 'refs/changes/18/112018/1' of git://gold.eng.hq.xensource.com/git/github/openstack-dev/devstack into tmpbranch