Contains fix for:  bug #12642  bug #12376 (same fix that had been done for Advanced Query of clinportal)
Contains fix for:
 bug #12642
 bug #12376 (same fix that had been done for Advanced Query of clinportal)

SVN-Revision: 21478

asamgir/openspecimen,krishagni/openspecimen,asamgir/openspecimen,krishagni/openspecimen,asamgir/openspecimen,krishagni/openspecimen