Changes made to fix combo
Merge branch 'clinportal_trunk' of https://github.com/NCIP/catissue-dynamic-extensions into clinportal_trunk