Merge "Rename event logical_resource_id to resource_name"

diff --cc heat/db/sqlalchemy/models.py
Simple merge

diff --cc heat/tests/test_api_openstack_v1.py
Simple merge

diff --cc heat/tests/test_engine_service.py
Simple merge