changes topic structure
adds broker usename and pwd
removes brokerPwd
fixes if statement
removes BrokerUserID

Created brokerId from CientId + ":" + clientId
updates topic
removes brokerUserId from demo