Squashed 'conf/' content from commit 496ea3a

git-subtree-dir: conf
git-subtree-split: 496ea3a36abb4c529467795dd926f302ff3cb4ed
Merge commit '01be316f93c712e13bc41c1e0f7985c6dc2a098a' as 'conf'
Initial state files commit
Adopted official salt formula recoomendations