Fixing a bug when mounting using the UUID but the device is mounted using the actual device.  Results in an attempt to umount and remount.
states.jboss7: avoid shadowing built-in types

************* Module salt.states.jboss7
salt/states/jboss7.py:221: [W0622(redefined-builtin), __get_ds_value] Redefining built-in 'dict'
salt/states/jboss7.py:290: [W0622(redefined-builtin), __log_binding_change] Redefining built-in 'type'
salt/states/jboss7.py:716: [W0622(redefined-builtin), __check_dict_contains] Redefining built-in 'dict'
dos2unix salt/states/jboss7.py
dos2unix salt/modules/jboss7.py
Switch imports and revert the assert to what it was.
Clarification
Added state_aggregate placeholders to the master/minion conf files
Added docs for the state-level aggregate keyword

Also added clarification on the two ways to invoke the aggregation
function.
Merge pull request #18661 from rickh563/develop

Clarification
API support for salt-ssh
Always run download_packages() after executing buildpackage SLS

By restricting this function call to when the script is successful, we
end up losing the log file from buildpackage.py when it fails, making it next to
impossible to troubleshoot. This commit makes jenkins retrieve at least
the log file, no matter what happens.
Add listen= flags and set in runner
Escaping single quote
Merge pull request #18638 from s0undt3ch/2014.7

Some 2014.7 test fixes
Lint fixes
More lint fixes!
Fixing a bug if a swap device is specified as one of the special symlinks, eg. the links under /dev/disk/by-uuid
Cleanup names, this is now a channel, not an sreq
Convert saltutil to use channel instead of sreq
Convert wheel to channel interface as well