merging revisions r10194 and r10196 from trunk/modules/cdm_dataportal to branch/modules/cdm_dataportal_realease-2.4.3/
merging revisions r10194 and r10196 from trunk/modules/cdm_dataportal to branch/modules/cdm_dataportal_realease-2.4.3/