Merge branch 'default-to-colstore' of https://github.com/pivotalsoftware/quickstep into default-to-colstore