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