Zabbix

.......... [ZBXNEXT-1256] use different partition discovery keys for solaris/linux example userparams, so that example file may be directly included
svn merge -c 28668 ../branches/2.0 .