Merge changes Iaf248668,Ic1701cd0,I56274973

* changes:
  Mediator cleanup
  Refactor dependency inversion interfaces
  Remove legacy data and properties view from layer trace root