Make group timeout configurable.

lib/roles/app.js

@@ -460,8 +460,8 @@ module.exports = function(options) {
                 , user.name
                 , user.group
                 )
-              , options.groupTimeout
-              , wireutil.toDeviceRequirements(data)
+              , data.timeout || null
+              , wireutil.toDeviceRequirements(data.requirements)
               )
             )
           ])
@@ -473,7 +473,7 @@ module.exports = function(options) {
           , wireutil.transaction(
               responseChannel
             , new wire.UngroupMessage(
-                wireutil.toDeviceRequirements(data)
+                wireutil.toDeviceRequirements(data.requirements)
               )
             )
           ])

lib/roles/device/plugins/group.js

@@ -44,7 +44,7 @@ module.exports = syrup.serial()
           log.info('Now owned by "%s"', currentGroup.email)
           log.info('Subscribing to group channel "%s"', currentGroup.group)
 
-          channels.register(currentGroup.group, timeout)
+          channels.register(currentGroup.group, timeout || options.groupTimeout)
           sub.subscribe(currentGroup.group)
 
           push.send([