[zanata/zanata-platform] b8f880: ZNTA-1865 fix up after merge

[GitHub]

  Branch: refs/heads/ZNTA-1865-version-tm-merge
  Home:   https://github.com/zanata/zanata-platform
  Commit: b8f8807cc351090c4bf169e4fea0ae3a760a3001
      https://github.com/zanata/zanata-platform/commit/b8f8807cc351090c4bf169e4fea0ae3a760a3001
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2017-06-22 (Thu, 22 Jun 2017)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/async/AsyncTaskKey.java
    M server/zanata-war/src/main/java/org/zanata/rest/editor/service/TransMemoryMergeManager.java

  Log Message:
  -----------
  ZNTA-1865 fix up after merge