Cleaning up bugs related to perf improvement changes

lib/ansible/executor/task_queue_manager.py

@@ -96,7 +96,7 @@ class TaskQueueManager:
         self._workers = []
 
     def _initialize_workers(self, num):
-        for i in xrange(num_workers):
+        for i in xrange(num):
             main_q = multiprocessing.Queue()
             rslt_q = multiprocessing.Queue()
 

lib/ansible/template/vars.py

@@ -83,10 +83,7 @@ class AnsibleJ2Vars:
         if isinstance(variable, dict) and varname == "vars" or isinstance(variable, HostVars):
             return variable
         else:
-            if self._templar._contains_vars(variable):
+            return self._templar.template(variable)
-                return self._templar.template(variable)
-            else:
-                return variable
 
     def add_locals(self, locals):
         '''