[Bro-Dev] [JIRA] (BIT-1087) topic/dnthayer/broctl-fixes