Zabbix

..F....... [ZBX-22724] made export of templates more consistent

* commit '17c6b38c82a2f9200296c14561fbc4c035845f9d':
  ..F....... [ZBX-22724] added re-assignment of condition formulaid after sorting
  ..F....... [ZBX-22724] fixed structure for sorting within graph items
  ..F....... [ZBX-22724] added further sorting between graphs with same name
  ..F....... [ZBX-22724] improved code style
  ..F....... [ZBX-22724] fixed missing default for LLD filter conditions
  .......... [ZBX-22724] transferred changes from 6.0 branch; resolved conflicts