Adds --show-timeout to force the display of unresponsive minions
Removes debugging and badly merged code
Potential for for issue #7152
adding bulk worker functions
changed the list_running_memebers function to return status as well
duplication fix
Add with_retcode option to ShellCase.run_call(). Also adds a test case for https://github.com/saltstack/salt/issues/6973 - expect a non-zero exit code when running "salt-call --retcode-passthrough state.highstate"
Add with_retcode options for ShellCase functions
ec2 and service handlers added to keystone
added service and larger example to keystone state
Fix inconsistent indentation in config file templates

In the config file templates, some parameters are commented out with a
pound sign, and others are commented out using a pound sign and a space.
This has led to some confusion when people uncomment some params to use
them and then there are errors when PyYAML tries to render the data.

This commit makes the commenting of config parameters uniform, using
just a pound sign with no extra space.
Warn and deprecate passing a salt environment to `env` which is to be used for system environment variables.
Also deprecated wrong `env` usage in the `cmd` state.
salt/modules/lxc.py:69: [W0613(unused-argument), _gen_config] Unused argument 'name'
salt/modules/state.py:471: [W0621(redefined-outer-name), show_top] Redefining name 'top' from outer scope (line 332)
salt/utils/__init__.py:1239: [W0621(redefined-outer-name), parse_kwarg] Redefining name 'string' from outer scope (line 19)
salt/modules/pip.py:774: [W0621(redefined-outer-name), list_] Redefining name 'version' from outer scope (line 790)
states.alternatives: avoid shadowing set() built-in type
Merge pull request #7239 from hulu/alternatives-set-shadow

states.alternatives: avoid shadowing set() built-in type
Merge pull request #7230 from terminalmage/conf-file-indentation

Fix inconsistent indentation in config file templates
Merge pull request #7227 from KennethWilke/develop

Added keystone service and ec2 handling