Fix include conflicts

Employ jinja include statements instead of native salt ones
to be able to activate multiple services/features at once.

Change-Id: I49b3b15fadf1aca5d2c369bb0b055b4271c4f779
Closes-Bug: PROD-20132
5 files changed