merged from release-5-2-2

git-svn-id: https://svn.kuali.org/repos/kfs/branches/release-5-3@44455 05dbba50-812c-11dd-b2f5-a7aa3c7f87f7
KFSCNTRB-2046.Code changes based on code review.

git-svn-id: https://svn.kuali.org/repos/kfs/branches/release-5-3@44457 05dbba50-812c-11dd-b2f5-a7aa3c7f87f7