Added the alert macros _agentcustomid_ and _modulecustomid_.

Merged from develop.