Channels already do the reauth and if you want timeouts you have to pass tries (which it didn't do before anyways)
fix for #15585
Fix typo in salt call parsing
Correct `--output-file-append` test
Improved fix for the newline at the end of crontabs

Fixes issue #15699 and improves PR #15771
Fix file.directory in test mode to show all the changes (user, group and/or mode) instead of just one
Added support for capabilities in docker state.
Fixed 'virtual: VirtualPC' setting on FreeBSD in salt/grains/core.py
Added test functionality in all state functions within salt.states.keystone
Missed spaces for indentation
Removing extra quote
Fixing pylint violations
Switch mdadm.create to not shell out
Need to properly add lists to each other
Let's do assemble while we're at it
Fix mdadm tests
Fix a small typo.

Signed-off-by: Warren Turkal <wt@signalfuse.com>
Merge pull request #15993 from terminalmage/bp-15986

Backport #15986 to 2014.7
Merge pull request #15971 from rallytime/bp-15768

Backport #15768 to 2014.7
Merge pull request #15974 from rallytime/bp-15826

Backport #15826 to 2014.7