Merge tag 'v2014.1.1' into sl_2014.1-2

Version 2014.1.1

Conflicts:
	salt/client/__init__.py
	salt/config.py
	salt/minion.py
Add salt.utils.get_user()
Replace refs to getpass.getuser() with salt.utils.get_user()
Replace refs to getpass.getuser() with salt.utils.get_user()
Replace refs to getpass.getuser() with salt.utils.get_user()
Replace refs to getpass.getuser() with salt.utils.get_user()
Replace refs to getpass.getuser() with salt.utils.get_user()
Replace refs to getpass.getuser() with salt.utils.get_user()
Replace refs to getpass.getuser() with salt.utils.get_user()
Merge pull request #11703 from terminalmage/issue11628-2014.1

Use pwd (where available) to get username (2014.1 branch)
Disable tests in salt spec
Fixing typo in formatted string
fixing per #11318
Merge pull request #11729 from timoguin/2014.1

Cherry pick typo fixes for iptables state
Replace getpass.getuser()
Test fix for #11717

Conflicts:
	salt/state.py
fixing bug in rabbitmq state
Put the SSH defaults in config.py and use them.

Fixes #10604

Conflicts:
	salt/config.py
make sure top.sls is evaluated in order
Fix --list all option