Added basic support for hash_behaviour=merge in roles

Dict vars passed to roles are now properly merged
instead of simply overriding dict vars that are
coming from vars_files.
Merge pull request #3114 from laggyluke/roles_combine_vars

Added basic support for hash_behaviour=merge in roles