Ensure stable ordering of CPs
Merge branch 'OS_v20' of https://github.com/krishagni/openspecimen into OS_v20