Merge "Rename heat logical_resource_id to resource_name"