Added more verbose output for Sample and HistoSys config parsing
Merging in cleanup