mod. rename broker target for requests - there will be multiple

Change-Id: I477f40538b5b9f3f4fa3b58bff139d01def95a87
merge. repair_runtime.

Change-Id: I35fc913234fd3c08217f1022f123f4106e7fae4c