cluster: RHEL58 - rgmanager: Backport upstream fixes for SAPDatabase agent