Merge pull request #3800 from kgaillot/backport
Backport pacemaker-attrd tracking of node XML ID to 2.1 branch