Fix conf_dir
=> data_dir
required for preparing cluster#231
Merged
noelmcloughlin merged 2 commits intosaltstack-formulas:masterfrom Jun 21, 2018
conf_dir
=> data_dir
required for preparing cluster#231