Merge pull request #6584 from basepi/pkgformatting

Fix formatting in salt.states.pkg.py
Fix some formatting
Add config.merge function for merginc config values across sources
Use config.merge instead of config.option for scheduling, Fix #6201