RSM

.......... [ZBX-2594] updated to latest from /master

# Conflicts:
#	create/src/schema.tmpl
#	src/libs/zbxdbupgrade/dbupgrade_5030.c
#	ui/disc_prototypes.php
#	ui/include/defines.inc.php
#	ui/include/views/configuration.item.list.php
#	ui/include/views/configuration.item.massupdate.php
#	ui/include/views/configuration.item.prototype.list.php
#	ui/include/views/configuration.trigger.prototype.list.php
#	ui/include/views/configuration.trigger.prototype.massupdate.php
#	ui/include/views/configuration.triggers.massupdate.php
#	ui/items.php