Conflicts:
	lib/ansible/runner/__init__.py

Ensure that when transferring a file to a directory the name of the file is the correct basename and not 'source'.

Strip quotes when parsing my.cnf

Remove leading/trailing single or double quotes when parsing the my.cnf
file in mysql_user and mysql_db.

Do this so that these modules parse the my.cnf file the same way that
the mysql client does.

From: http://dev.mysql.com/doc/refman/5.0/en/option-files.html

    You can optionally enclose the value within single quotation marks
    or double quotation marks, which is useful if the value contains a
    “#” comment character.

Fixes #2405

inject a dictionary of avaiable variables and the environment into executor

Make logging to journal match what goes to syslog on non-systemd hosts

Added SunOS (Solaris, illumos, etc) service management 

attempt to add service to chkconfig when suggested

Added additional filter options for instances for EC2 and Eucalyptus

fixed doc regarding wild card pattern on groups.

rhn_channel module

Support systemd template service unit files

Add quotes around postgresql database name

disabled appending file with garbage when regexp didn't match.

Fix pathnames in comments

Limit scope of arguments to service_control() in service module

Changed python interpreter to be consistent in these modules as compared...

Fix broken virtualenv link in pip documentation.