A couple more tweaks to role default variables/dependencies

* Default variables are now fed directly into roles, just like the
  other variables, so that roles see their unique values rather
  than those set at the global level.

* Role dependency duplicates are now determined by checking the params used
  when specifying them as dependencies rather than just on the name of the
  role. For example, the following would be included twice without having
  to specify "allow_duplicates: true":

  dependencies:
  - { role: foo, x: 1 }
  - { role: foo, x: 2 }
Fixing bug in playbook use of default variables in roles
Reverting the role default variables change

Loading the default variables in _build_role_dependencies() lead to
a side-effect where those variables were over-riding inventory variables.
tmp
tmp
tmp
tmp
tmp
tmp
tmp
tmp
Pass 'skipped' parameter to on_task_start callback, so it can optionally not trigger
Merge branch 'cloudformation-rewrite' into devel
Merge branch 'group-vars-pattern-file' into devel
Merge branch 'lookup-handle-AnsibleUndefinedVariable' into devel
Merge branch 'merge-host-vars-fix' into devel
Merge branch 'merge-non-dict-fix' into devel
Merge branch 'module-env-shebang' into devel
Merge branch 's3-list' into devel
Merge branch 'supervisorctl-rewrite' into devel

Conflicts:
	library/web_infrastructure/supervisorctl