[zanata/zanata-platform] 32c1df: Merge branch 'master' into ZNTA-1942-stats

[GitHub]

  Branch: refs/heads/ZNTA-1942-stats
  Home:   https://github.com/zanata/zanata-platform
  Commit: 32c1df7bccc7031f8d372ba2370b77054c96497b
      https://github.com/zanata/zanata-platform/commit/32c1df7bccc7031f8d372ba2370b77054c96497b
  Author: Alex Eng <aeng at redhat.com>
  Date:   2017-05-11 (Thu, 11 May 2017)

  Changed paths:
    M Jenkinsfile
    A server/etc/scripts/runJbossCli.groovy
    A server/etc/scripts/zanata-config-arq-test.cli
    A server/etc/scripts/zanata-config-test-common.cli
    M server/functional-test/pom.xml
    R server/functional-test/src/test/conf/standalone.xml
    R server/functional-test/src/test/conf/standalone_wildfly.xml
    M server/pom.xml
    A server/zanata-frontend/src/frontend/app/editor/actions/action-types.js
    A server/zanata-frontend/src/frontend/app/editor/actions/glossary-action-types.js
    M server/zanata-frontend/src/frontend/app/editor/actions/glossary-actions.js
    A server/zanata-frontend/src/frontend/app/editor/actions/header-action-types.js
    M server/zanata-frontend/src/frontend/app/editor/actions/header-actions.js
    M server/zanata-frontend/src/frontend/app/editor/actions/index.js
    A server/zanata-frontend/src/frontend/app/editor/actions/phrases-action-types.js
    M server/zanata-frontend/src/frontend/app/editor/actions/phrases-actions.js
    A server/zanata-frontend/src/frontend/app/editor/actions/suggestions-action-types.js
    M server/zanata-frontend/src/frontend/app/editor/actions/suggestions-actions.js
    M server/zanata-frontend/src/frontend/app/editor/api/index.js
    M server/zanata-frontend/src/frontend/app/editor/reducers/context-reducer.js
    A server/zanata-frontend/src/frontend/app/editor/reducers/context-reducer.test.js
    M server/zanata-frontend/src/frontend/app/editor/reducers/dropdown-reducer.js
    A server/zanata-frontend/src/frontend/app/editor/reducers/dropdown-reducer.test.js
    M server/zanata-frontend/src/frontend/app/editor/reducers/glossary-reducer.js
    A server/zanata-frontend/src/frontend/app/editor/reducers/glossary-reducer.test.js
    M server/zanata-frontend/src/frontend/app/editor/reducers/header-data-reducer.js
    A server/zanata-frontend/src/frontend/app/editor/reducers/header-data-reducer.test.js
    M server/zanata-frontend/src/frontend/app/editor/reducers/phrase-reducer.js
    A server/zanata-frontend/src/frontend/app/editor/reducers/phrase-reducer.test.js
    M server/zanata-frontend/src/frontend/app/editor/reducers/suggestions-reducer.js
    A server/zanata-frontend/src/frontend/app/editor/reducers/suggestions-reducer.test.js
    M server/zanata-frontend/src/frontend/app/editor/reducers/ui-reducer.js
    A server/zanata-frontend/src/frontend/app/editor/reducers/ui-reducer.test.js
    M server/zanata-frontend/src/frontend/makefile
    M server/zanata-war/pom.xml
    M server/zanata-war/src/test/resources/arquillian.xml
    R server/zanata-war/src/test/resources/arquillian/standalone-arquillian-wildfly.xml
    R server/zanata-war/src/test/resources/arquillian/standalone-arquillian.xml

  Log Message:
  -----------
  Merge branch 'master' into ZNTA-1942-stats

https://zanata.atlassian.net/browse/ZNTA-1954