Restore ProfileGroup notification override functionality

Also clean up a little.

JIRA: CYAN-3164
Change-Id: I9b71a225996315f517b59d2d6f4074175bbf2d64
(cherry picked from commit 0af22dd78bb0f00a25e313b0575bbae7f76c4f4b)