Merge "Create a Schema from a parameter"

diff --cc heat/engine/properties.py
Simple merge

diff --cc heat/tests/test_properties.py
index db64551eaf495090d233870555d4eb3e5f39e1a6,003338e1b00cb6f2b93b28c915b46607fa7c1a21..aa737fd0f2dc6ef17066bf3bbe2b88a2e9943ec9
--- 1/heat/tests/test_properties.py
--- 2/heat/tests/test_properties.py
+++ b/heat/tests/test_properties.py
@@@ -15,8 -15,9 +15,9 @@@
  
  import testtools
  
+ from heat.engine import parameters
  from heat.engine import properties
 -from heat.engine import resource
 +from heat.engine import resources
  from heat.common import exception