PLUS-1044, PLUS-1003 for Pathik S
Merge branch 'plus-trunk' of https://github.com/NCIP/catissue-core into plus-trunk