Merge pull request #3623 from ralph-tice/fix_3567_2

changed role path template to read all vars instead of just extra_vars

lib/ansible/playbook/play.py

@@ -151,7 +151,7 @@ class Play(object):
         has_dict = {}
 
         for role_path in roles:
-            orig_path = template(self.basedir,role_path,self.playbook.extra_vars)
+            orig_path = template(self.basedir,role_path,self.vars)
 
             if type(orig_path) == dict:
                 # what, not a path?