[midPoint-git] [Evolveum/midpoint] 490f3f: Post-merge test fixes

[Radovan Semancik]

  Branch: refs/heads/support-3.6
  Home:   https://github.com/Evolveum/midpoint
  Commit: 490f3f73145e58db61892df972fff19e90eed675
      https://github.com/Evolveum/midpoint/commit/490f3f73145e58db61892df972fff19e90eed675
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-09-29 (Fri, 29 Sep 2017)

  Changed paths:
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestMultiResource.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestImportRecon.java

  Log Message:
  -----------
  Post-merge test fixes