Refers to issues #6276, #5973, #5936 and #5435 This reverts commit 72e63767ac. Conflicts: website/docs/source/v2/provisioning/salt.html.md
72e63767ac