The salt-api service is configured using the master config files but is
not restarted when the master is restarted. We need the salt-api service
to watch the master config files to ensure that any config changes are
picked up.

Also watch salt-api pkg instead of salt-master one.

This reverts commit 7bb82b0178.

This reverts commit 8a1b8dc9db.

This reverts commit 90282eff03.

This reverts commit c5ae289fa1.

This reverts commit 22b8dde1ff.

Seems there are several colons missing for salt.api to work correctly, hope I found all of them

Signed-off-by: René Jochum <rene@jochums.at>

Signed-off-by: René Jochum <rene@jochums.at>

Signed-off-by: René Jochum <rene@jochums.at>

Signed-off-by: René Jochum <rene@jochums.at>

If you are installing Salt via git/pip, the formula will try to overwrite your
install with packaged versions. This setting makes it possible to avoid that.

Using a variable named salt is a bad idea when salt already has a variable
named salt.