Merge changes Id3875cd9,Ia8ca7fd6,I254079fd

* changes:
  Cleanup unused areas of NotifEntry and related
  Remove unused autoredacted member from NotifEntry
  Remove last ranking-derived member from NotifEntry