Merge branch '2014.7' into develop

Conflicts:
	salt/modules/mount.py
Merge pull request #15524 from hulu/typos

fix typos in doc/topics/jobs/job_cache.rst
Merge pull request #15525 from hulu/scripts-typos

fix typos in salt/scripts.py
Merge pull request #15504 from lyft/boto-vpc-fixes

Lookup VPC security groups anywhere VPC resources are used
Merge pull request #15522 from rallytime/multimaster_docs

Update multimaster tutorial
Merge pull request #15521 from UtahDave/2014.7local

Add some detail to the CloudClient api doc
Merge pull request #15494 from basepi/bp-15340

Backport #15340 to 2014.7
Merge pull request #15526 from basepi/fp-15378

Forward-port #15378 to 2014.7
Merge pull request #15505 from cimarronm/file_expanduser

expanduser on paths in file
Use the user based thing dir for the states calls
Merge pull request #15509 from ajacoutot/service-enabled-kwargs

Service enabled kwargs
Merge pull request #15516 from nmadhok/add-tag-docker-push

Adding optional tag functionality to salt.modules.dockerio.push
Merge pull request #15512 from ajacoutot/obsd-tests

tests: recognize OpenBSD
Merge pull request #15507 from cimarronm/pip_list_upgrades

Additional functionality for modules.pip
Merge pull request #15510 from lyft/boto_elb_resolve_error_on_deregister_instances_call

deregister_instances and register_instances methods return True/False/None
Fix pylint errors
You can pass raid.assemble a comma-separated list of devices now
Merge pull request #15528 from thatch45/thin_dir

Use the user based thin dir for the states calls
Merge pull request #15531 from rallytime/pylint_fix

Fix pylint errors
Resolve issue #15532 set metadata to mdadm