[zanata/zanata-server] 9956fe: add plural form for me-ME

Mon Apr 20 00:34:37 UTC 2015

  Branch: refs/heads/zanata-assets-jar
  Home:   https://github.com/zanata/zanata-server
  Commit: 9956fe13ee2e75bfedd6b509ada096e2d4c51966
      https://github.com/zanata/zanata-server/commit/9956fe13ee2e75bfedd6b509ada096e2d4c51966
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-11-28 (Fri, 28 Nov 2014)

  Changed paths:
    M zanata-war/src/main/resources/pluralforms.properties

  Log Message:
  -----------
  add plural form for me-ME

  Commit: 25bf1e2dcb5bdc827ad23c89ed04368f7c3a024c
      https://github.com/zanata/zanata-server/commit/25bf1e2dcb5bdc827ad23c89ed04368f7c3a024c
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2015-03-31 (Tue, 31 Mar 2015)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/CorePage.java
    M functional-test/src/test/java/org/zanata/feature/projectversion/EditVersionValidationsTest.java

  Log Message:
  -----------
  Check errors when a test page is created/returned

We can assume, in cases other than testing the error page, that
the error page should not be seen when transitioning between
other pages.  Add a check in the constructor for all core pages
of Zanata.

  Commit: 846756e5dccd8530faaef9524baeaf049ebb48e3
      https://github.com/zanata/zanata-server/commit/846756e5dccd8530faaef9524baeaf049ebb48e3
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2015-03-31 (Tue, 31 Mar 2015)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/AbstractPage.java
    M functional-test/src/main/java/org/zanata/page/account/RegisterPage.java

  Log Message:
  -----------
  Remove excess waits for test page

  Commit: 89ed042e00f8e96fd8d7577d5181ab67675c9a87
      https://github.com/zanata/zanata-server/commit/89ed042e00f8e96fd8d7577d5181ab67675c9a87
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2015-03-31 (Tue, 31 Mar 2015)

  Changed paths:
    M functional-test/pom.xml
    M pom.xml
    M zanata-model/pom.xml
    M zanata-test-war/pom.xml
    M zanata-war/pom.xml

  Log Message:
  -----------
  [maven-release-plugin] prepare release server-3.6.1

  Commit: bc8a9fa502cbdf70a62b830e0a298311a518f8ca
      https://github.com/zanata/zanata-server/commit/bc8a9fa502cbdf70a62b830e0a298311a518f8ca
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2015-03-31 (Tue, 31 Mar 2015)

  Changed paths:
    M functional-test/pom.xml
    M pom.xml
    M zanata-model/pom.xml
    M zanata-test-war/pom.xml
    M zanata-war/pom.xml

  Log Message:
  -----------
  [maven-release-plugin] prepare for next development iteration

  Commit: 26bf0a4764d644ba7e6d1186297354ee1671c920
      https://github.com/zanata/zanata-server/commit/26bf0a4764d644ba7e6d1186297354ee1671c920
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-03-31 (Tue, 31 Mar 2015)

  Changed paths:
    M functional-test/pom.xml
    M zanata-war/src/main/resources/db/changelogs/db.changelog-1.5.xml

  Log Message:
  -----------
  Fix liquibase changeset to be compatible with mysql/mariadb version > 5.5

  Commit: 4fa9e013f9c8442233e5977852510898cae12d8e
      https://github.com/zanata/zanata-server/commit/4fa9e013f9c8442233e5977852510898cae12d8e
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2015-04-01 (Wed, 01 Apr 2015)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/groups/VersionGroupsPage.java
    M functional-test/src/main/java/org/zanata/page/projects/ProjectsPage.java
    M functional-test/src/test/java/org/zanata/feature/project/EditProjectGeneralTest.java
    M functional-test/src/test/java/org/zanata/feature/project/SetProjectVisibilityTest.java
    M functional-test/src/test/java/org/zanata/feature/search/ProjectSearchTest.java
    M zanata-war/src/main/resources/messages.properties

  Log Message:
  -----------
  Rename Obsolete to Archived in UI and tests

  Commit: e03311131c4bff95df2462d4cc9c45d2d02a59de
      https://github.com/zanata/zanata-server/commit/e03311131c4bff95df2462d4cc9c45d2d02a59de
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2015-04-01 (Wed, 01 Apr 2015)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/groups/VersionGroupsPage.java
    M functional-test/src/main/java/org/zanata/page/projects/ProjectsPage.java
    M functional-test/src/test/java/org/zanata/feature/project/EditProjectGeneralTest.java
    M functional-test/src/test/java/org/zanata/feature/project/SetProjectVisibilityTest.java
    M functional-test/src/test/java/org/zanata/feature/search/ProjectSearchTest.java
    M zanata-war/src/main/resources/messages.properties

  Log Message:
  -----------
  Merge pull request #758 from zanata/fix-some-texts

Rename Obsolete to Archived in UI and tests

  Commit: f7988dee4db5826e93cb4b6af09a4af8dd0777b6
      https://github.com/zanata/zanata-server/commit/f7988dee4db5826e93cb4b6af09a4af8dd0777b6
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-04-02 (Thu, 02 Apr 2015)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  Upgrade RichFaces to 4.5.4.Final

  Commit: 0c26461fc1f790e1d1e683c4df291059121c105a
      https://github.com/zanata/zanata-server/commit/0c26461fc1f790e1d1e683c4df291059121c105a
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2015-04-02 (Thu, 02 Apr 2015)

  Changed paths:
    M functional-test/pom.xml
    M pom.xml
    M zanata-model/pom.xml
    M zanata-test-war/pom.xml
    M zanata-war/pom.xml

  Log Message:
  -----------
  [maven-release-plugin] prepare release server-3.6.2

  Commit: cf1a1f016caaf7d62070c4d6d82e218d8190361d
      https://github.com/zanata/zanata-server/commit/cf1a1f016caaf7d62070c4d6d82e218d8190361d
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2015-04-02 (Thu, 02 Apr 2015)

  Changed paths:
    M functional-test/pom.xml
    M pom.xml
    M zanata-model/pom.xml
    M zanata-test-war/pom.xml
    M zanata-war/pom.xml

  Log Message:
  -----------
  [maven-release-plugin] prepare for next development iteration

  Commit: 129ca6ebabb224ce9edfac4b5b69e54ca5cecab3
      https://github.com/zanata/zanata-server/commit/129ca6ebabb224ce9edfac4b5b69e54ca5cecab3
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2015-04-02 (Thu, 02 Apr 2015)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/AbstractPage.java
    M functional-test/src/main/java/org/zanata/page/account/RegisterPage.java

  Log Message:
  -----------
  Merge pull request #671 from zanata/remove-excess-wait

Remove excess waits for test page

  Commit: 88faf70a20dbe4dd47bcdf3f8d794c02cc6de1f1
      https://github.com/zanata/zanata-server/commit/88faf70a20dbe4dd47bcdf3f8d794c02cc6de1f1
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2015-04-02 (Thu, 02 Apr 2015)

  Changed paths:
    M zanata-war/src/main/resources/pluralforms.properties

  Log Message:
  -----------
  Merge pull request #641 from zanata/me-plural

add plural form for me-ME

  Commit: c709d394b183c1aff92511185eec3df412789e8c
      https://github.com/zanata/zanata-server/commit/c709d394b183c1aff92511185eec3df412789e8c
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2015-04-02 (Thu, 02 Apr 2015)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/CorePage.java
    M functional-test/src/test/java/org/zanata/feature/projectversion/EditVersionValidationsTest.java

  Log Message:
  -----------
  Merge pull request #676 from zanata/check-test-for-error-page

Check errors when a test page is created/returned

  Commit: 762490d783ee8ffa8599abf03b39f44a36f93a3a
      https://github.com/zanata/zanata-server/commit/762490d783ee8ffa8599abf03b39f44a36f93a3a
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-04-02 (Thu, 02 Apr 2015)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/release' into integration/master

Conflicts:
	functional-test/pom.xml
	pom.xml
	zanata-model/pom.xml
	zanata-test-war/pom.xml
	zanata-war/pom.xml

  Commit: 2080dfcfff684f52385c2eb9f27c7d34f7affc15
      https://github.com/zanata/zanata-server/commit/2080dfcfff684f52385c2eb9f27c7d34f7affc15
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-04-02 (Thu, 02 Apr 2015)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  Remove unwanted RichFaces dependencies

  Commit: c0b7f4c0db97926ee8196dd4d6874b8d32d2093c
      https://github.com/zanata/zanata-server/commit/c0b7f4c0db97926ee8196dd4d6874b8d32d2093c
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-04-07 (Tue, 07 Apr 2015)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  Merge pull request #764 from zanata/fix-rf-deps

Remove unwanted RichFaces dependencies

  Commit: 307b8908e53676bb5b164bd8c1d88f0acc56a631
      https://github.com/zanata/zanata-server/commit/307b8908e53676bb5b164bd8c1d88f0acc56a631
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-04-07 (Tue, 07 Apr 2015)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  Merge branch 'release' into integration/master

Conflicts:
	pom.xml

  Commit: 176cf021a4d7c13da0b05f0092236ef866cb2535
      https://github.com/zanata/zanata-server/commit/176cf021a4d7c13da0b05f0092236ef866cb2535
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-04-07 (Tue, 07 Apr 2015)

  Changed paths:
    M pom.xml
    M zanata.xml

  Log Message:
  -----------
  Update zanata-maven-plugin to 3.6.0; update version to release

  Commit: f857aaadaca09efd379ff741d23277cd584236d3
      https://github.com/zanata/zanata-server/commit/f857aaadaca09efd379ff741d23277cd584236d3
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-04-07 (Tue, 07 Apr 2015)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  Merge branch 'release' into integration/master

  Commit: 7f67211741f3f13c2d8ffdb10d79b41e31d4499c
      https://github.com/zanata/zanata-server/commit/7f67211741f3f13c2d8ffdb10d79b41e31d4499c
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-04-08 (Wed, 08 Apr 2015)

  Changed paths:
    M zanata-war/src/main/resources/messages_bg.properties
    M zanata-war/src/main/resources/messages_br.properties
    M zanata-war/src/main/resources/messages_cs.properties
    M zanata-war/src/main/resources/messages_de.properties
    M zanata-war/src/main/resources/messages_en_GB.properties
    M zanata-war/src/main/resources/messages_eo.properties
    M zanata-war/src/main/resources/messages_es_ES.properties
    M zanata-war/src/main/resources/messages_fr.properties
    M zanata-war/src/main/resources/messages_gu.properties
    M zanata-war/src/main/resources/messages_hu.properties
    M zanata-war/src/main/resources/messages_it.properties
    M zanata-war/src/main/resources/messages_ja.properties
    M zanata-war/src/main/resources/messages_ko.properties
    M zanata-war/src/main/resources/messages_nl.properties
    M zanata-war/src/main/resources/messages_pt_BR.properties
    M zanata-war/src/main/resources/messages_ru.properties
    M zanata-war/src/main/resources/messages_tr.properties
    M zanata-war/src/main/resources/messages_uk.properties
    M zanata-war/src/main/resources/messages_zh_Hans_CN.properties
    M zanata-war/src/main/resources/messages_zh_TW_Hant.properties

  Log Message:
  -----------
  Fetch latest translations from translate.zanata.org (release)

  Commit: 80d40591b9204a6e8e446eb1758f4c92e6e3ba4e
      https://github.com/zanata/zanata-server/commit/80d40591b9204a6e8e446eb1758f4c92e6e3ba4e
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-04-08 (Wed, 08 Apr 2015)

  Changed paths:
    M zanata-war/src/main/resources/messages_bg.properties
    M zanata-war/src/main/resources/messages_br.properties
    M zanata-war/src/main/resources/messages_cs.properties
    M zanata-war/src/main/resources/messages_de.properties
    M zanata-war/src/main/resources/messages_en_GB.properties
    M zanata-war/src/main/resources/messages_eo.properties
    M zanata-war/src/main/resources/messages_es_ES.properties
    M zanata-war/src/main/resources/messages_fr.properties
    M zanata-war/src/main/resources/messages_gu.properties
    M zanata-war/src/main/resources/messages_hu.properties
    M zanata-war/src/main/resources/messages_it.properties
    M zanata-war/src/main/resources/messages_ja.properties
    M zanata-war/src/main/resources/messages_ko.properties
    M zanata-war/src/main/resources/messages_nl.properties
    M zanata-war/src/main/resources/messages_pt_BR.properties
    M zanata-war/src/main/resources/messages_ru.properties
    M zanata-war/src/main/resources/messages_tr.properties
    M zanata-war/src/main/resources/messages_uk.properties
    M zanata-war/src/main/resources/messages_zh_Hans_CN.properties
    M zanata-war/src/main/resources/messages_zh_TW_Hant.properties

  Log Message:
  -----------
  Merge branch 'release' into integration/master

  Commit: 512f620de51ba01058f19207e46f1a0288be5897
      https://github.com/zanata/zanata-server/commit/512f620de51ba01058f19207e46f1a0288be5897
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-04-08 (Wed, 08 Apr 2015)

  Changed paths:
    A docs/.gitattributes

  Log Message:
  -----------
  Set merge=union for release-notes.md in .gitattributes

  Commit: c40c2ddbb773456f98817cc0a4e332e51583e5b5
      https://github.com/zanata/zanata-server/commit/c40c2ddbb773456f98817cc0a4e332e51583e5b5
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-04-09 (Thu, 09 Apr 2015)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  Add Undertow modules from WildFly 9 for WildFly tests

  Commit: 435fa361dc103fe1f4436141fd9ee4f32fdee12e
      https://github.com/zanata/zanata-server/commit/435fa361dc103fe1f4436141fd9ee4f32fdee12e
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-04-09 (Thu, 09 Apr 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/util/HttpUtil.java

  Log Message:
  -----------
  Handle missing/empty proxy header

  Commit: 4cb4b3766a4aa8a4a5b4e507d3158595c542b33d
      https://github.com/zanata/zanata-server/commit/4cb4b3766a4aa8a4a5b4e507d3158595c542b33d
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-04-10 (Fri, 10 Apr 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/util/HttpUtil.java

  Log Message:
  -----------
  Merge pull request #771 from zanata/handle-missing-proxy-header

Handle missing/empty proxy header

  Commit: 4e098e3236de8c691bb4ace2eade7094c5c84a46
      https://github.com/zanata/zanata-server/commit/4e098e3236de8c691bb4ace2eade7094c5c84a46
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-04-13 (Mon, 13 Apr 2015)

  Changed paths:
    M functional-test/pom.xml
    M zanata-war/src/main/resources/db/changelogs/db.changelog-1.5.xml

  Log Message:
  -----------
  Merge pull request #756 from zanata/mariadb-fix

rhbz1048293 Fix liquibase changeset to be compatible with mysql/mariadb version > 5.5

  Commit: 5e9decdc0f7ec424618175060203f24f19acdf95
      https://github.com/zanata/zanata-server/commit/5e9decdc0f7ec424618175060203f24f19acdf95
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-04-13 (Mon, 13 Apr 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/util/HttpUtil.java

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/release' into integration/master

  Commit: 86d1ae0665888e5f83dbc91f4e27b7cca7af5288
      https://github.com/zanata/zanata-server/commit/86d1ae0665888e5f83dbc91f4e27b7cca7af5288
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-04-15 (Wed, 15 Apr 2015)

  Changed paths:
    A docs/.gitattributes

  Log Message:
  -----------
  Merge pull request #769 from zanata/merge-release-notes

Set merge=union for release-notes.md in .gitattributes

  Commit: c63409a760de7f59cd1e7489f4067357bab09fad
      https://github.com/zanata/zanata-server/commit/c63409a760de7f59cd1e7489f4067357bab09fad
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-04-15 (Wed, 15 Apr 2015)

  Changed paths:
    A docs/.gitattributes

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/release' into integration/master

  Commit: 8e11a04e0e42e00520bcb501d68211d7f86667ce
      https://github.com/zanata/zanata-server/commit/8e11a04e0e42e00520bcb501d68211d7f86667ce
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-04-16 (Thu, 16 Apr 2015)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  Merge pull request #768 from zanata/add-undertow-module

Add Undertow modules for WildFly tests

  Commit: 06db1090b75be199498b29a6eea075851d4d9c73
      https://github.com/zanata/zanata-server/commit/06db1090b75be199498b29a6eea075851d4d9c73
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-04-16 (Thu, 16 Apr 2015)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  Merge branch 'release' into integration/master

  Commit: e3ffc75a09875eb20b697ae315b742ae2d072e30
      https://github.com/zanata/zanata-server/commit/e3ffc75a09875eb20b697ae315b742ae2d072e30
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-04-16 (Thu, 16 Apr 2015)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  Revert "Add Undertow modules from WildFly 9 for WildFly tests"

This reverts commit c40c2ddbb773456f98817cc0a4e332e51583e5b5.

  Commit: d102ee2e4250400ad30412b4ec19e44593283b77
      https://github.com/zanata/zanata-server/commit/d102ee2e4250400ad30412b4ec19e44593283b77
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-04-16 (Thu, 16 Apr 2015)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  Merge branch 'release' into integration/master

  Commit: 0c3dad8bb3d9b44d86eaa928c6bb111b70692839
      https://github.com/zanata/zanata-server/commit/0c3dad8bb3d9b44d86eaa928c6bb111b70692839
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-04-17 (Fri, 17 Apr 2015)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/CorePage.java

  Log Message:
  -----------
  Skip checking of critical errors (too slow due to implicit wait)

  Commit: 9c3d0e65ab3f69d91e991ebcbfc4edae72fba380
      https://github.com/zanata/zanata-server/commit/9c3d0e65ab3f69d91e991ebcbfc4edae72fba380
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-04-17 (Fri, 17 Apr 2015)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/CorePage.java

  Log Message:
  -----------
  Merge pull request #777 from zanata/skip-check-crit

Skip checking of critical errors (too slow due to implicit wait)

  Commit: 400b523966d085c6f346e95e56144225e6b37e8f
      https://github.com/zanata/zanata-server/commit/400b523966d085c6f346e95e56144225e6b37e8f
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-04-20 (Mon, 20 Apr 2015)

  Changed paths:
    A docs/.gitattributes
    M functional-test/pom.xml
    M functional-test/src/main/java/org/zanata/page/AbstractPage.java
    M functional-test/src/main/java/org/zanata/page/CorePage.java
    M functional-test/src/main/java/org/zanata/page/account/RegisterPage.java
    M functional-test/src/main/java/org/zanata/page/groups/VersionGroupsPage.java
    M functional-test/src/main/java/org/zanata/page/projects/ProjectsPage.java
    M functional-test/src/test/java/org/zanata/feature/project/EditProjectGeneralTest.java
    M functional-test/src/test/java/org/zanata/feature/project/SetProjectVisibilityTest.java
    M functional-test/src/test/java/org/zanata/feature/projectversion/EditVersionValidationsTest.java
    M functional-test/src/test/java/org/zanata/feature/search/ProjectSearchTest.java
    M pom.xml
    M zanata-war/src/main/java/org/zanata/util/HttpUtil.java
    M zanata-war/src/main/resources/db/changelogs/db.changelog-1.5.xml
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/resources/messages_bg.properties
    M zanata-war/src/main/resources/messages_br.properties
    M zanata-war/src/main/resources/messages_cs.properties
    M zanata-war/src/main/resources/messages_de.properties
    M zanata-war/src/main/resources/messages_en_GB.properties
    M zanata-war/src/main/resources/messages_eo.properties
    M zanata-war/src/main/resources/messages_es_ES.properties
    M zanata-war/src/main/resources/messages_fr.properties
    M zanata-war/src/main/resources/messages_gu.properties
    M zanata-war/src/main/resources/messages_hu.properties
    M zanata-war/src/main/resources/messages_it.properties
    M zanata-war/src/main/resources/messages_ja.properties
    M zanata-war/src/main/resources/messages_ko.properties
    M zanata-war/src/main/resources/messages_nl.properties
    M zanata-war/src/main/resources/messages_pt_BR.properties
    M zanata-war/src/main/resources/messages_ru.properties
    M zanata-war/src/main/resources/messages_tr.properties
    M zanata-war/src/main/resources/messages_uk.properties
    M zanata-war/src/main/resources/messages_zh_Hans_CN.properties
    M zanata-war/src/main/resources/messages_zh_TW_Hant.properties
    M zanata-war/src/main/resources/pluralforms.properties
    M zanata-war/src/main/webapp/WEB-INF/layout/project/languages-list.xhtml

  Log Message:
  -----------
  Merge branch 'integration/master' into zanata-assets-jar

Compare: https://github.com/zanata/zanata-server/compare/6a59b8a892d8...400b523966d0