Fix #3846

When the syndic merges minion and master opts interface needs to
persist
Merge pull request #4195 from terminalmage/issue2908

Automagically chkconfig --add custom initscripts
Fixed formatting in doc/topics/tests/index.rst
Merge branch 'develop' of https://github.com/saltstack/salt into develop
Merge pull request #4197 from zsimic/develop

Fixed formatting in doc/topics/tests/index.rst
load the module if pillar/grain config exists
Merge pull request #4203 from ranl/develop

load the tomcat module if pillar/grain config exists
Make file.sed return true even if `after` isn't found in file
Merge pull request #4206 from basepi/sedfix4063

Make file.sed return true even if `after` isn't found in file
Rename file.contains_regex to file.contains_regex_multiline
Remove lchar from file.contains_regex_multiline
Add file.contains_regex (operates on single lines)
Use posix path sep since master only runs on posix
Copy stats to win_file
Force group and user to 0 for now.
Fix posix path separator
add a mention of the include_empty option to file.recurse
Replace file.contains_regex with multiline version (keep same behavior)
Fix test=True when multiprocessing = False
Use salt.utils.fopen instead of open