re-applying changes from commit d060b95d3b which were overwritten
updates to broker mgt doc
re-applying changes from pull/236 which were overwritten
Merge pull request #244 from shalako/master

re-applying changes from PRs which have been overwritten