v6r9

Conflicts resolved after merging with rel-v6r8

Merge remote-tracking branch 'upstream/rel-v6r8' into rel-v6r8

Merge remote-tracking branch 'upstream/integration' into integration

Merge remote-tracking branch 'upstream/rel-v6r9' into rel-v6r9

Use COMDIRAC v0r4 in prereleases