Fix-up for I8fbef8279

Puppet functions can't return undef, so group is set to the empty string.

Change-Id: I714a3384c04fce630b344a3ccee06b18a5031476
Merge "Fix-up for I8fbef8279" into production