Add integration tests for 'modules.file.replace()'.
Fix backup and pre-/append behaviour in modules.file.replace():
Don't use -t -t for scp commands when tty enabled in salt-ssh
Discard stderr for salt-ssh with tty

Because we're using a tty, we only get a combined stdout and stderr. So
we throw away the stderr from our salt command and we don't worry about
the lack of an RSTR in the stderr on the master side
Simplify initial search. Determine 'backup' properly.
Add missing line.
Fix tests for #18841.
Fix tests for #18841.
Pylint.
Fix states.schedule examples
Merge pull request #19082 from Lendar/fix-schedule-examples

Fix states.schedule examples
Adding ability to do a test run with test=True. #18966
Fix regression in lxc.update_lxc_conf

This regression snuck in after the 2014.7.0 release, in d447cead. Fixing
this ahead of the 2014.7.1 release.
Merge pull request #19047 from eliasp/2014.7-modules.file.replace-test-coverage

2014.7 file.replace integration test coverage
Merge pull request #19065 from basepi/salt-ssh-tty-16847

Fix salt-ssh with sudo and tty enabled
Merge pull request #19086 from rallytime/bp-19014

Backport #19014 to 2014.7
Merge pull request #19088 from terminalmage/fix-update_lxc_conf

Fix regression in lxc.update_lxc_conf
Merge branch '2014.7' into merge-forward

Conflicts:
	salt/client/ssh/shell.py
	salt/modules/file.py
	tests/integration/states/file.py
Merge pull request #19096 from basepi/merge-forward

Merge forward from 2014.7 to develop