heat had it's api split into two binaries (cfn & cloudwatch)

- Rename heat-api to heat-api-cfn
- Add heat-api-cloudwatch
- Also removed unused heat-engine-paste.ini file.
- Fix the path to the conf dir (etc/heat not etc/)

Change-Id: I9b2c7c5cd7052d5eb6d730833c65812c2f8a0ee1
Signed-off-by: Angus Salkeld <asalkeld@redhat.com>
diff --git a/stack.sh b/stack.sh
index a3160d5..efbf38c 100755
--- a/stack.sh
+++ b/stack.sh
@@ -999,7 +999,7 @@
     ADMIN_PASSWORD=$ADMIN_PASSWORD SERVICE_TENANT_NAME=$SERVICE_TENANT_NAME SERVICE_PASSWORD=$SERVICE_PASSWORD \
     SERVICE_TOKEN=$SERVICE_TOKEN SERVICE_ENDPOINT=$SERVICE_ENDPOINT SERVICE_HOST=$SERVICE_HOST \
     S3_SERVICE_PORT=$S3_SERVICE_PORT KEYSTONE_CATALOG_BACKEND=$KEYSTONE_CATALOG_BACKEND \
-    DEVSTACK_DIR=$TOP_DIR ENABLED_SERVICES=$ENABLED_SERVICES HEAT_API_PORT=$HEAT_API_PORT \
+    DEVSTACK_DIR=$TOP_DIR ENABLED_SERVICES=$ENABLED_SERVICES HEAT_API_CFN_PORT=$HEAT_API_CFN_PORT \
         bash -x $FILES/keystone_data.sh
 
     # Set up auth creds now that keystone is bootstrapped