Merge pull request #3269 from wenningerk/merge_back_to_main
Merge 2.1 back to main after Pacemaker-2.1.7-rc2