Fix Badge className not being correctly set

Fixes group icons on Admin permissions page

js/src/common/components/Badge.js

@@ -25,8 +25,8 @@ export default class Badge extends Component {
     const iconChild = iconName ? icon(iconName, { className: 'Badge-icon' }) : m.trust(' ');
 
     const badgeAttrs = {
-      className,
       ...attrs,
+      className,
     };
 
     const badgeNode = <div {...badgeAttrs}>{iconChild}</div>;