[midPoint-git] [Evolveum/midpoint] 31d05c: Last post-merge fixes

[Radovan Semancik]

  Branch: refs/heads/cases-ui-merge
  Home:   https://github.com/Evolveum/midpoint
  Commit: 31d05c317551d21b7346912afc546b013088e672
      https://github.com/Evolveum/midpoint/commit/31d05c317551d21b7346912afc546b013088e672
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2018-03-28 (Wed, 28 Mar 2018)

  Changed paths:
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/ObjectTypes.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelController.java

  Log Message:
  -----------
  Last post-merge fixes