Merge pull request #3005 from kgaillot/groups
Continue bringing libpacemaker up to current guidelines