Re-inject opts into modules under multi-master mode.
Merge pull request #15848 from cachedout/multimaster_opts

Re-inject opts into modules under multi-master mode.
Fix --define directive for Cent5 builds
Merge pull request #15853 from terminalmage/buildpackage-el5

Fix --define directive for Cent5 builds
Fix encoding issues in nested output

This fixes #15542
Remove unused import
Merge pull request #15854 from terminalmage/bp-15546

Backport #15546 to 2014.7 branch
BUG: Fix the absolute directory check in file.symlink for the path of the symbolic link itself and perform user expansion on that.

Conflicts:
	salt/modules/file.py
Merge pull request #15868 from rallytime/bp_f8177149

Backport f8177149