mediator-service

Checkout
Sedlack, Aron
committed
6852
on 17 Mar 16
APPDEV-4842: merge maint back to trunk