Back-port #36124 to 2016.3 (#36296)
Back-port #36124 to 2016.3 (#36296)

* Use /etc instead of /root

* Skip test on anything but linux

* Add missing import (lint)

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