[zanata/zanata-platform] 515887: Merge branch 'release'

[GitHub]

  Branch: refs/heads/merge-release
  Home:   https://github.com/zanata/zanata-platform
  Commit: 515887e4abcd6a4db1f3a36f9b8ba3f68897f642
      https://github.com/zanata/zanata-platform/commit/515887e4abcd6a4db1f3a36f9b8ba3f68897f642
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2017-12-13 (Wed, 13 Dec 2017)

  Changed paths:
    M server/docker/conf/zanata-config.cli
    M server/services/src/main/java/org/zanata/servlet/UrlRewriteConfig.java
    A server/services/src/test/java/org/zanata/servlet/UrlRewriteConfigTest.kt

  Log Message:
  -----------
  Merge branch 'release'