Merge "fix csit, cleanup dockerfile for osdf"