Move AWS::CloudFormation::* resources to heat/engine/resources/aws/cfn

Change-Id: Ida463bef4fef9cf7b6f6451bbd7d798d321a6c86
Implements: blueprint reorganize-resources-code-structure

heat/engine/resources/aws/cfn/wait_condition.py

@@ -16,7 +16,7 @@ from heat.common import identifier
 from heat.engine import attributes
 from heat.engine import constraints
 from heat.engine import properties
-from heat.engine.resources.aws import wait_condition_handle as aws_wch
+from heat.engine.resources.aws.cfn import wait_condition_handle as aws_wch
 from heat.engine.resources.openstack import wait_condition as heat_wc
 from heat.engine import support
 

heat/engine/resources/openstack/wait_condition_handle.py

@@ -16,7 +16,7 @@ import uuid
 from heat.common.i18n import _
 from heat.engine import attributes
 from heat.engine import resource
-from heat.engine.resources.aws import wait_condition_handle as aws_wch
+from heat.engine.resources.aws.cfn import wait_condition_handle as aws_wch
 from heat.engine.resources import wait_condition as wc_base
 from heat.engine import support
 

heat/tests/aws/test_waitcondition.py

@@ -26,7 +26,7 @@ from heat.common import template_format
 from heat.db import api as db_api
 from heat.engine import environment
 from heat.engine import parser
-from heat.engine.resources.aws import wait_condition_handle as aws_wch
+from heat.engine.resources.aws.cfn import wait_condition_handle as aws_wch
 from heat.engine import rsrc_defn
 from heat.engine import scheduler
 from heat.tests import common

heat/tests/test_metadata_refresh.py

@@ -19,8 +19,8 @@ from heat.common import identifier
 from heat.common import template_format
 from heat.engine import environment
 from heat.engine import parser
+from heat.engine.resources.aws.cfn import wait_condition_handle as aws_wch
 from heat.engine.resources.aws.ec2 import instance
-from heat.engine.resources.aws import wait_condition_handle as aws_wch
 from heat.engine.resources import server
 from heat.engine import scheduler
 from heat.engine import service

heat/tests/test_nested_stack.py

@@ -24,7 +24,7 @@ from heat.common import urlfetch
 from heat.db import api as db_api
 from heat.engine import parser
 from heat.engine import resource
-from heat.engine.resources import stack as stack_res
+from heat.engine.resources.aws.cfn import stack as stack_res
 from heat.engine import rsrc_defn
 from heat.tests import common
 from heat.tests import generic_resource as generic_rsrc