Don't allow --list-providers to be passed in as arg for --list-profiles
Merge pull request #15247 from saltstack/bp-14882

Backport #14882 to 2014.7
Update to dockerio.import_image()

Import image was failing for me because the _parse_image_multilogs_string() function was returning a list containing:

[u'\n', u'\r', {'status', '....'}]

The import_image function then takes this returned list and attempts to access the dictionary containing the status by checking index 0 of the list.  Since the status is in index 2, this fails.

This change should prevent '\r' and '\n' from being added to the list.
Fixing typo
Merge pull request #15288 from nmadhok/spelling

Fixing typo
Merge pull request #15245 from saltstack/bp-14851

Backport #14851 to 2014.7
Merge pull request #15254 from saltstack/bp-15030

Backport #15030 to 2014.7
Merge pull request #15258 from saltstack/bp-15070

Backport #15070 to 2014.7
Merge pull request #15272 from dmick/fix-15269

salt/utils/process.py: fix order of args to os.kill()
Merge pull request #15273 from rallytime/list_profiles

Add --list-profiles to salt-cloud query options
Merge pull request #15276 from hvnsweeting/fix-file-diff

bugfix: only create dict key if value is not empty
Merge pull request #15283 from ajacoutot/obsd-sysctl

Implement the sysctl state on OpenBSD.
Merge pull request #15284 from ajacoutot/obsd-useradd

useradd: fix OpenBSD support
Merge pull request #15253 from saltstack/bp-15029

Backport #15029 to 2014.7
Merge pull request #15241 from saltstack/bp-14552

Backport #14552 to 2014.7
Merge branch '2014.7' into develop

Conflicts:
	salt/modules/gem.py
	salt/modules/lxc.py
	salt/states/boto_elb.py
	salt/states/gem.py
	tests/unit/states/gem_test.py
Merge pull request #15263 from saltstack/bp-15179

Backport #15179 to 2014.7
Merge pull request #15264 from saltstack/bp-15206

Backport #15206 to 2014.7
Fix CLI example for convert_to_arn
Merge pull request #15291 from basepi/botoarnexample

Fix CLI example for convert_to_arn