Merge pull request #14538 from makinacorpus/fix

Fix pepa shortcircuiting all scripts args at it'simport time...
Merge remote-tracking branch 'salt/develop' into develop
file.copy part2
file.copy: be smart with file changes
Merge branch 'fix2' into develop
file.copy: be smart with file changes
Merge branch 'fix2' into develop

Conflicts:
	salt/states/file.py