SIRONA-11 cleaning up boomerang collector mode

git-svn-id: https://svn.apache.org/repos/asf/incubator/sirona/trunk@1566992 13f79535-47bb-0310-9956-ffa450edef68