Zabbix

.......... [DEV-2135] refactored cache and history libraries part 3

Merge in ZBX/zabbix from feature/DEV-2135-6.3-3 to master

* commit '612ad5b803a99142e856aa42c38fb4cebb0d4860':
  .......... [DEV-2135] fixed integration tests
  .......... [DEV-2135] refactored cache and history libraries part 3