Merge pull request #2808 from kgaillot/term
Replace legacy terminology for CIB primary/secondary instances