Changes to take message broker port separately

Signed-off-by: Manula Thantriwatte <manula@apache.org>