Revert "Merge pull request #891 from Mirantis/port-mcollective-broadcast-fix"

This reverts commit 748c00d079753242f9b087a9ee82bc7fde53bbb5, reversing
changes made to d7614fc026cb9619820088b92a4cba278b151033.