RAZ-3163: On asset expiration send out notification to groups
- Code cleanup and tweaks