[midPoint-git] [Evolveum/midpoint] 3a3671: Fixing replace delta merge bug (MID-3028)

[Radovan Semancik]

  Branch: refs/heads/support-3.3
  Home:   https://github.com/Evolveum/midpoint
  Commit: 3a3671f63ed14dd2f5c60356fcc29cf4c1bcf99c
      https://github.com/Evolveum/midpoint/commit/3a3671f63ed14dd2f5c60356fcc29cf4c1bcf99c
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2016-05-16 (Mon, 16 May 2016)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ItemDelta.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/TestDelta.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensUtil.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ObjectTemplateProcessor.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestUserTemplate.java
    M model/model-intest/src/test/resources/common/role-captain.xml
    M model/model-intest/src/test/resources/common/role-thief.xml
    M model/model-intest/src/test/resources/logback-test.xml

  Log Message:
  -----------
  Fixing replace delta merge bug (MID-3028)