Fix tests for pchanges backport into 2018.3
Fix tests for pchanges backport into 2018.3

Conflicts:
  - tests/unit/states/test_file.py

saltstack/salt,saltstack/salt,saltstack/salt,saltstack/salt,saltstack/salt