fixed a few DataMan problems caused by recent merges

Created by: JasonRuonanWang

@chuckatkins Please review.

Merge request reports

Loading