added exception handler
Tweak releasenotes
Fix pylint errors.
Merge pull request #15735 from syphernl/fix/docs_201470

Tweak releasenotes for 2014.7.0
Adding a module to manage and interact with GPG keychain on minions.
Fixing a typo, thanks @s0undt3ch!
Fixing lint issue related to re.findall.
Linting
Merge pull request #15737 from rallytime/pylint

Fix pylint errors.
Fixing lint issues not related to gpg module but that are breaking the pylint unit test.
Merge pull request #15627 from cachedout/issue_15587

Catch exceptions
Merge pull request #15728 from rallytime/cleanup_integration

Remove unused kwarg from _check_state_return
Merge pull request #15712 from hulu/idiom

make _LXCConfig.as_string() more idiomatic Python
Added test functionality in all state functions within salt.states.keystone
Missed spaces for indentation
Removing extra quote
Merge pull request #15659 from s0undt3ch/features/function-type

Check for functions and not callables
Merge pull request #15660 from ajacoutot/obsd-sysctl-fix

openbsd_sysctl: fix module when a value already exists
Merge pull request #15392 from ihrwein/f/add-syslog-ng-modules

F/add syslog ng modules
Merge branch '2014.7' into temp-merge-forward

Conflicts:
	salt/minion.py