transition correctly to manorsetup
Fix failing auth test
Merge pull request #13899 from cachedout/fix_state_tests

Fix failing state tests
Decorate teardown just to be sure
Do not do a list_nodes_min for --query commands
Merge pull request #13901 from cachedout/fix_arg_test

Fix broken arg test
Merge pull request #13864 from whiteinge/salt-ssh-sls-dict-tweaks

Tweaks to salt-ssh error handling
Just run useradd/userdel once
Added cleaAllDir to clean up Raet Stack Keep directories
Fixed error in minion.flo
Merge remote-tracking branch 'upstream/develop' into sam_raet_48

Conflicts:
	salt/daemons/flo/minion.flo
Merge pull request #13904 from SmithSamuelM/sam_raet_48

Added better cleanup of Raet Stack Keep data directories with .clearAllDir
Merge pull request #13885 from techhat/ec2

Add default value for del_all_vols_on_destroy
Satisfying s0undt3ch's pendatic nature
Add missing period at end of sentence
Update 'doc/.tx/config' - Build #99

  http://cookingwithsalt.org/job/salt/job/transifex/99/

Signed-off-by: Pedro Algarvio <pedro@algarvio.me>
Fix indentation
New line fix
New line fix
Merge pull request #13903 from techhat/minlist

Do not do a list_nodes_min for --query commands
Add support for registering and deregistering ELB members in boto_elb module