[midPoint-git] [Evolveum/midpoint] 189b21: resolve conflicts after cherrypick from master

[Katarina Valalikova]

  Branch: refs/heads/support-3.3
  Home:   https://github.com/Evolveum/midpoint
  Commit: 189b21eeb9ce2772b00a7755ce8d48e8e0f721f5
      https://github.com/Evolveum/midpoint/commit/189b21eeb9ce2772b00a7755ce8d48e8e0f721f5
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2016-03-31 (Thu, 31 Mar 2016)

  Changed paths:
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/Clockwork.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/AssignmentProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/InboundProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ProjectionValuesProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ReconciliationProcessor.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/WfHook.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlRepositoryServiceImpl.java

  Log Message:
  -----------
  resolve conflicts after cherrypick from master