Merge branch 'puppet_instances' of github.com:heat-api/heat into puppet_instances

Conflicts:
	heat/api/v1/__init__.py

diff --cc heat/api/v1/__init__.py
index d107a5fca636d703bd3f13816b7dc16e19c287ec,f69150e08f7662bc970b492aebe3b53357c3b28a..460fc57f775dd552df49e78f38ccab2efd5f2793
--- 1/heat/api/v1/__init__.py
--- 2/heat/api/v1/__init__.py
+++ b/heat/api/v1/__init__.py
@@@ -77,8 -77,7 +77,8 @@@ class API(wsgi.Router)
  
          mapper.connect("/", controller=stacks_resource,
                         action="validate_template",
 -                       conditions=dict(function=self.action('ValidateTemplate')))
 +                       conditions=dict(function=self.action('ValidateTemplate')
-                        ))
++            ))
  
          mapper.connect("/", controller=stacks_resource, action="index")