Merge pull request #2320 from kgaillot/changes21
Deprecate non-Pacemaker-specific public C APIs for 2.1.0