[zanata/zanata-platform] 17b17f: Merge branch 'master' into ZNTA-845-findbugs-2

[GitHub]

  Branch: refs/heads/ZNTA-845-findbugs-2
  Home:   https://github.com/zanata/zanata-platform
  Commit: 17b17fcf804b8933625507c7f23bd27c1a156945
      https://github.com/zanata/zanata-platform/commit/17b17fcf804b8933625507c7f23bd27c1a156945
  Author: Alex Eng <aeng at redhat.com>
  Date:   2017-05-12 (Fri, 12 May 2017)

  Changed paths:
    M server/zanata-frontend/src/frontend/package.json
    A server/zanata-frontend/src/frontend/scripts/dev-server.config.js
    A server/zanata-frontend/src/frontend/scripts/dev-server.js
    M server/zanata-frontend/src/frontend/webpack.dev.config.js
    R server/zanata-frontend/src/frontend/webpack.dev.editor.config.js
    M server/zanata-frontend/src/frontend/yarn.lock
    M server/zanata-war/src/main/java/org/zanata/service/impl/ActivityLockManager.java

  Log Message:
  -----------
  Merge branch 'master' into ZNTA-845-findbugs-2