Hotfix for broker ids returned as string from zk.
Merge branch 'develop'