* commit '3b7ea727':
  ZP-865 Update year.
  ZP-846 Update year.
  ZP-846 If folderdata is found also check if the synckey corresponds to the latest hierarchy synckey and update it if not.
  ZP-865 Abort conflict detection if there are more 100 changes to be exported.
  ZP-864 Do not convert UTF-8 only encoding. Updated copyright dates for changed files.
  ZP-864 Do not convert if charset encoding is already UTF-8.