Handle port offset from carbon or system property

Remove obsolete properties from broker.xml
Added.