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