The upstream pacemaker 1.1 branch is in a similar life cycle stage as RHEL 7 -- it only gets selected backports (almost entirely bug fixes) from the current master branch. In fact the majority of changes in 1.1 are from Red Hatters backporting fixes needed in RHEL 7.
Rebasing will take care of at least 7 RHEL BZs plus a few other bugs found and fixed upstream, and would be much easier than cherry-picking.
Marking verified in pacemaker-1.1.21-2.el7.
Full regression test suite will be run, any/all issues will be filed as new BZs.