Merge "Fix group id of broker package"