Mine over raet
Fixing lint in salt/daemons/flo/core.py
Fixing lint in tests/integration/shell/auth.py
Fixing lint in salt/modules/tls.py
Fix broken test.
Add newest cherry-pick to 2014.1.6 release notes
Merge pull request #13950 from basepi/2014.1.6release

Add newest cherry-pick to 2014.1.6 release notes
Merge pull request #13936 from cachedout/mine_raet

Mine over raet
Merge pull request #13939 from nmadhok/fix-pylint

Fixing lint
Merge pull request #13942 from cachedout/call_test_fix

Fix broken test.
Move imports
White-space related fixes
Remove extra commas