[zanata/zanata-platform] f766ee: fix(ZNTA-1780): Add tests to OpenID fix

[GitHub]

  Branch: refs/heads/fix-openid-merge
  Home:   https://github.com/zanata/zanata-platform
  Commit: f766eee16a2c3a40e3961be19b02c0f79f32cf5d
      https://github.com/zanata/zanata-platform/commit/f766eee16a2c3a40e3961be19b02c0f79f32cf5d
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2017-03-06 (Mon, 06 Mar 2017)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/action/AccountMergeAction.java
    A server/zanata-war/src/test/java/org/zanata/action/AccountMergeActionTest.java

  Log Message:
  -----------
  fix(ZNTA-1780): Add tests to OpenID fix