Merge "Validate properties against the schema in validate_template"

diff --cc heat/engine/service.py
index 55b793cfaf25c8a9d4b37b12e921fee65384edb9,484fee1017dfea2aae4211fcdd674b4c0dbdec05..583c743729fed16490bfa8eff7aa2bab4ac0d5b8
--- 1/heat/engine/service.py
--- 2/heat/engine/service.py
+++ b/heat/engine/service.py
@@@ -28,7 -28,9 +28,8 @@@ from heat.common import exceptio
  from heat.common import identifier
  from heat.engine import parameters
  from heat.engine import parser
+ from heat.engine import properties
  from heat.engine import resource
 -from heat.engine import resources  # pyflakes_bypass review 23102
  from heat.engine import watchrule
  
  from heat.openstack.common import log as logging