Review @ Coding Standards.
Hotfix: Fixed test requirements.
Case 2796 - Fixed entity calls.
case 2970 - Log particular error state.
Merge branch 'case-2970' into new-search

* case-2970:
  case 2970 - Log particular error state.
Hotfix - Implemented getIll_Status() to avoid errors.
Merge branch 'new-search' into develop