[zanata/zanata-server] d02350: Fix merge release to master (#1192)

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/zanata/zanata-server
  Commit: d02350341ec0dcf42d8a9ab7e1209707d245f41c
      https://github.com/zanata/zanata-server/commit/d02350341ec0dcf42d8a9ab7e1209707d245f41c
  Author: Alex Eng <aeng at redhat.com>
  Date:   2016-06-06 (Mon, 06 Jun 2016)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/jpa/NoNestingTransactionStrategy.java
    M zanata-war/src/main/java/org/zanata/limits/RateLimitManager.java
    M zanata-war/src/main/java/org/zanata/notification/EmailQueueMessageReceiver.java
    M zanata-war/src/main/java/org/zanata/notification/LanguageTeamPermissionChangeJmsMessagePayloadHandler.java
    M zanata-war/src/main/java/org/zanata/rest/service/IntrospectableObjectMonitorService.java
    A zanata-war/src/main/java/org/zanata/util/ScopeHelper.java
    M zanata-war/src/test/java/org/zanata/notification/EmailQueueMessageReceiverTest.java

  Log Message:
  -----------
  Fix merge release to master (#1192)