fixed a few DataMan problems caused by recent merges

Podhorszki, Norbertrequested to merge
github/fork/JasonRuonanWang/dataman into master

Created by: JasonRuonanWang

@chuckatkins Please review.

Merge request reports