Merge pull request #308 in ZP/z-push from bugfix/ZP-990-koe-race-condition-when-connecting to develop

* commit '13dba524':
  ZP-990 Detect case that KOE is sending changed categories back and ignore it if categories are the same on the server and in outlook.
  ZP-990 Detect case that KOE is sending changed categories back.