Merge pull request #3786 from nrwahl2/nrwahl2-fixes
Minor refactors related to Pacemaker Remote connection sockets