Merge "Convert Stack to separate action/status"

diff --cc heat/api/cfn/v1/stacks.py
Simple merge

diff --cc heat/api/openstack/v1/stacks.py
Simple merge

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

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

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