don't set data_directory in config when we configure it via env#1577
Draft
evgeni wants to merge 1 commit intopuppetlabs:mainfrom 
Draft
don't set data_directory in config when we configure it via env#1577evgeni wants to merge 1 commit intopuppetlabs:mainfrom 
evgeni wants to merge 1 commit intopuppetlabs:mainfrom