Added wait_for_event function to saltmod

This allows the orchestrate system to watch the event bus for arbitrary
events.
add expand_repo_def needed by states pkgrepo.managed
fix pylint add extra line
Merge pull request #14969 from thatch45/2014.7

Add template files to manifest so they get included
Merge pull request #14935 from whiteinge/salt-orchestrate-event

Added wait_for_event function to saltmod
Merge pull request #14955 from mcalmer/zypper-add-expand_repo_def

add expand_repo_def needed by states pkgrepo.managed
Better approach to #14955

We can just detect if the function is there, so that we on;y need
to add it if the kwargs do need to be massaged.