Merge "heat api : Add policy.json authorization to CFN API"

diff --cc heat/tests/test_api_cfn_v1.py
index 014c8c47ca7879abe017388b523a8716e5435af8,0c3f27f55c8469588d2ec4773ec75cf186b01e83..e9d890c45f1ac869227a79ef80fb8a9d83c9cbf7
--- 1/heat/tests/test_api_cfn_v1.py
--- 2/heat/tests/test_api_cfn_v1.py
+++ b/heat/tests/test_api_cfn_v1.py
@@@ -18,8 -19,11 +19,9 @@@ import o
  import unittest
  from nose.plugins.attrib import attr
  
 -import json
 -
  from heat.common import context
  from heat.common import identifier
+ from heat.common import policy
  from heat.openstack.common import cfg
  from heat.openstack.common import rpc
  import heat.openstack.common.rpc.common as rpc_common