FIX: Use DN and Group to select Pilots
Merge pull request #1494 from graciani/bug_fix_v6r7

FIX: Use DN and Group to select Pilots
v6r7p31
Conflicts resolved after merging with rel-v6r7
v6r8p16
Merge remote-tracking branch 'upstream/rel-v6r8' into rel-v6r8