Merge pull request #6678 from s0undt3ch/develop

Add `versionadded` to the new `saltversioninfo` grain.
Added space
Do not include kwargs and other irrelevant fields in new_job event data
Merge pull request #6680 from SmithSamuelM/develop

Remove kwargs and other fields from new_job event
Re-import collections inside of yumpkg5._parse_pkginfo, Fix #6677
Merge pull request #6681 from basepi/pkgresource6677

Re-import collections inside of yumpkg5._parse_pkginfo, Fix #6677
minor whitespace cleaning
Add opts_pkg