2 hard returns before function def
Merge pull request #12157 from UtahDave/develop

2 hard returns before function def
fix check for test=True  per E712
Merge pull request #12158 from UtahDave/develop

fix check for test=True  per E712
Adding the ability to splay scheduled jobs.  The splay option to a scheduled job can either be a single value, in which case the splay is taken from 0 to that value, or can be specified as a dictionary with starting and ending values.
moving the splay code out of the handle_func and into the eval func.  more accurate splaying and no longer requires the time.sleep to be used.  first run is not splayed but subsequent run are.
Add the ability for the file.serialize state to merge content.

A new parameter, merge_if_exists, has been added to file.serialized
state. This enables the existing content to be preserved while merging
in the new data.
added versionadded directive to new apache state
Merge pull request #12163 from timoguin/develop

added versionadded directive to new apache state
Remove test.

Also pass makedirs correctly.
Merge pull request #12164 from cachedout/fix_file_test

Remove test.
Merge pull request #12128 from basepi/pillargrains

Ensure that the 'id' grain available to pillar is valid
Merge pull request #12125 from alusco/develop

Adds kwargs to the ddns state module to support passing through args to the ddns module
Merge pull request #12155 from terminalmage/issue10981

Avoid traceback for unexpected pkgin/pkg_info output
Changed prefix parameter in Yard .__init__ to lanename
Convention is to use the lanename for the prefix.  so its less confusing to call
it lanename instead of prefix.
Fix region key fetching from profiles in boto_sqs

I was pulling the wrong key in profiles for regions in boto_sqs.
This change addresses that.
Merge pull request #12166 from lyft/boto-sqs-fix-profile

Fix region key fetching from profiles in boto_sqs
Clarifications for require, watch, and prereq in requisites documentation
fix lint issues
fix lint issues