Re-review of openstack heat g3 for rawhide/F19

Signed-off-by: Steven Dake <sdake@redhat.com>