Fix data loading to unblock gvm

Change-Id: I5e145f1e8497d340cb72a8112c247e63b1c79362
Reviewed-on: http://gerrit.sjc.cloudera.com:8080/4537
Reviewed-by: Nong Li <nong@cloudera.com>
Reviewed-by: Victor Bittorf <victor.bittorf@cloudera.com>
Tested-by: Victor Bittorf <victor.bittorf@cloudera.com>