Backport #18486 to 2014.1

Backport #18486 to 2014.1

Conflicts:
	salt/modules/parted.py