[KFSQA-1012] Changes required for code review and KFS code changes.