I've noticed recently that the zabbix_agentd.conf file shipped with zabbix has changed a little. This means that during an upgrade I get prompted to check/merge my local configuration changes with those made by zabbix. Can I simply move my agent specific code into a file under the zabbix_agentd.d directory so upgrades just happen, but parameters such as "EnableRemoteCommands", "Server", "ServerActive" and "Hostname" can be overridden with a file under zabbix_agentd.d/