Existence of cvmfs group prevents rpm creation of cvmfs user

Currently new fermicloud SL7 VMs are created with a cvmfs group but not a cvmfs user id.  Installing the cvmfs rpm fails to create a user id.  The command that the rpm runs fails with this error:

# /usr/sbin/useradd -r -d /var/lib/cvmfs -s /sbin/nologin -c "CernVM-FS service account" cvmfs

useradd: group cvmfs exists - if you want to add this user to that group, use -g.

I think a fix for this is to use the code in the cvmfs-universal.spec %if 0%{?suse_version} code block by default for all rpm-based packages. That first checks for the group, creates it if not present, and adds '-g cvmfs' to the useradd command.