GCP-7874 junit test
revert fix as other modules expect the standard variable id
Merge branch 'master' of https://github.com/digitalabs/IBPMiddleware
as discussed, cValueId will be used for categorical variates that has data type 'categorical variable'. Otherwise, use the value
GCP-7955 - add checking for data type for categorical variates before checking the value for cValueId
rearranged order of fields in error message to display p-s-m (similar to the fieldbook format) instead of p-m-s
Merge remote-tracking branch 'origin' into branch_save_fieldmap