[midPoint-git] [Evolveum/midpoint] 259373: resolving conflics after cherry pick

[Katarina Valalikova]

  Branch: refs/heads/support-3.9
  Home:   https://github.com/Evolveum/midpoint
  Commit: 259373ddc4f3b3c0c23c03c0102edbfd869f2254
      https://github.com/Evolveum/midpoint/commit/259373ddc4f3b3c0c23c03c0102edbfd869f2254
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2019-06-28 (Fri, 28 Jun 2019)

  Changed paths:
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/AuthenticationEvaluatorImpl.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/MidpointPasswordValidator.java
    M model/model-impl/src/main/resources/ctx-model.xml

  Log Message:
  -----------
  resolving conflics after cherry pick