PAHMA-964: Add secondary sort on csid when listing docs for a docType.
Merge branch 'ucb-deploy_3.3' into botgarden_3.3