first draft
Merge remote-tracking branch 'upstream/develop' into ebuild_enhanced

Conflicts:
	salt/states/portage_config.py
some fixes
merge fix
other merge fix
added check_extra_requirements function
check_extra_requirements documentation
some fixes
fixes
doc fix
overlay->repository
Use an unicode aware context in the jinja render call. Refs #3436
Only `basestring`'s should be `unicode`'d.
Update before environment check-- to make sure you get all the branches
Add links to 0.16.0 Salt Windows installer.
Support parted 2.x for partition.part_list

Older parted (2.x) doesn't return info on disk flags. This commit checks
to see if the disk flags field is present in the output, and if not,
inserts the value '(not supported)' for this field, allowing
partition.part_list to return successfully on systems using parted 2.x.

Fixes #5616.
Comment clarification
bsd_shadow: rm unused `salt` import

************* Module salt.modules.bsd_shadow
W0611: 12,0: Unused import salt
Merge pull request #5887 from cvrebert/patch-1

bsd_shadow: rm unused `salt` import
Don't include 'disk flags' in return dict if not present in output