Fixed COLAB-205: Fail to deploy 5 portlets cause of: HotDeployException: Error registering plugins for ...
Merge branch 'thomas-dev' of https://github.com/CCI-MIT/XCoLab into COLAB-205
Merge branch 'thomas-dev' of https://github.com/CCI-MIT/XCoLab into COLAB-206
add drop-down option, "Do Not Advance: other”
added missing "SCREENING_DO_NOT_ADVANCE_OTHER" condition.