cleaned up DBClientZabbix::addTriggersRaw2_0() and DBClientZabbix::addFunctionsRaw2_0() by adding commonly used macro.