Rebased to latest oslo, now at 8837013, note a few interfaces changed requiring a some tweaks to the heat code Change-Id: I7dfc634b7c459edebca19dee522b396e3736aecc Signed-off-by: Steven Hardy <shardy@redhat.com>