Extra vars precedence issue with includes

Issue Type:

Bugfix Pull Request

Ansible Version:

1.7.1+ 

Environment:

Mac OSX 10.9

Summary:

Fixes variable precedence issue with include files where extra vars were not overriding default values as expected.

If when calling an include file, one of the parameters of the include was overridden with a value passed in as an 'extra', this value was not being passed in correctly to the include call. 

Steps To Reproduce:

The test_includes.yml integration test has been updated to illustrate the issue

Expected Results:

when running a playbook containing the following

- include: myinclude.yml some_var='{{extra_var}}'

 where some_var is set to 'default' in the group vars but -e some_var='overridden' in the ansible call. We would expect the include to see some_var as 'overridden'

Actual Results:

With the scenario above the some_var is not overridden as expected but remains 'default'