diff --git a/contrib/platform/cisco/ebuild/hlfr b/contrib/platform/cisco/ebuild/hlfr
index 8a2427ab35..04250e345b 100644
--- a/contrib/platform/cisco/ebuild/hlfr
+++ b/contrib/platform/cisco/ebuild/hlfr
@@ -23,11 +23,10 @@ enable_per_user_config_files=no
 enable_script_wrapper_compilers=yes
 enable_orterun_prefix_by_default=yes
 enable_io_romio=no
-enable_mca_no_build=carto,crs,snapc,crcp,ess-alps,ess-cnos,ess-lsf,ess-portals_utcp,ess-singleton,ess-slave,ess-slurm,ess-slurmd,ess-tm,ess-tool,filem,grpcomm-basic,grpcomm-cnos,grpcomm-hier,,iof-hnp,iof-orted,iof-tool,notifier-command,notifier-ftb,notifier-smtp,notifier-twitter,plm-alps,plm-ccp,plm-lsf,plm-process,plm-rshd,plm-slurm,plm-submit,plm-tm,plm-xgrid,ras-alps,ras-ccp,ras-gridengine,ras-loadleveler,ras-lsf,ras-slurm,ras-tm,routed-binomial,rmaps-load_balance,rmaps-rank_file,rmaps-round_robin,rmaps-seq,rmaps-topo,rml-ftrm,routed-binomial,routed-direct,routed-linear,routed-radix,routed-slave,timer-catamount,timer-aix,timer-altix,timer-solaris,timer-windows
+enable_mca_no_build=carto,crs,snapc,crcp,paffinity,ess-alps,ess-cnos,ess-lsf,ess-portals_utcp,ess-singleton,ess-slave,ess-slurm,ess-slurmd,ess-tm,ess-tool,filem,grpcomm-basic,grpcomm-cnos,grpcomm-hier,notifier,plm,ras,rmaps-load_balance,rmaps-rank_file,rmaps-round_robin,rmaps-seq,rmaps-topo,rml-ftrm,routed-binomial,routed-direct,routed-linear,routed-radix,routed-slave,timer-catamount,timer-aix,timer-altix,timer-solaris,timer-windows
 enable_contrib_no_build=libnbc,vt
 with_memory_manager=no
 with_tm=no
-with_openib=no
 with_devel_headers=yes
 with_slurm=no
 with_portals=no
diff --git a/contrib/platform/cisco/ebuild/hlfr.conf b/contrib/platform/cisco/ebuild/hlfr.conf
index 035c29cb60..1d48762f96 100644
--- a/contrib/platform/cisco/ebuild/hlfr.conf
+++ b/contrib/platform/cisco/ebuild/hlfr.conf
@@ -54,6 +54,8 @@ opal_set_max_sys_limits = 1
 
 # ORTE behavior
 orte_enable_recovery = 1
+orte_max_local_restarts = 1
+orte_max_global_restarts = 1
 routed = cm
 rmaps = resilient
 orte_create_session_dirs = 0
diff --git a/contrib/platform/cisco/ebuild/ludd b/contrib/platform/cisco/ebuild/ludd
index e7e063e6d4..72231249b9 100644
--- a/contrib/platform/cisco/ebuild/ludd
+++ b/contrib/platform/cisco/ebuild/ludd
@@ -23,7 +23,7 @@ enable_per_user_config_files=no
 enable_script_wrapper_compilers=no
 enable_orterun_prefix_by_default=yes
 enable_io_romio=no
-enable_mca_no_build=carto,crs,snapc,crcp,ess-alps,ess-cnos,ess-lsf,ess-portals_utcp,ess-singleton,ess-slave,ess-slurm,ess-slurmd,ess-tm,ess-tool,filem,grpcomm-basic,grpcomm-cnos,grpcomm-hier,notifier-command,notifier-ftb,notifier-smtp,notifier-twitter,plm-alps,plm-ccp,plm-lsf,plm-process,plm-rshd,plm-slurm,plm-submit,plm-tm,plm-xgrid,ras-alps,ras-ccp,ras-gridengine,ras-loadleveler,ras-lsf,ras-slurm,ras-tm,rmaps-rank_file,rmaps-topo,rml-ftrm,routed-direct,routed-linear,routed-radix,routed-slave,timer-catamount,timer-aix,timer-altix,timer-solaris,timer-windows
+enable_mca_no_build=carto,crs,snapc,crcp,paffinity,ess-alps,ess-cnos,ess-lsf,ess-portals_utcp,ess-singleton,ess-slave,ess-slurm,ess-slurmd,ess-tm,ess-tool,filem,grpcomm-basic,grpcomm-cnos,grpcomm-hier,notifier-command,notifier-ftb,notifier-smtp,notifier-twitter,plm-alps,plm-ccp,plm-lsf,plm-process,plm-rshd,plm-slurm,plm-submit,plm-tm,plm-xgrid,ras-alps,ras-ccp,ras-gridengine,ras-loadleveler,ras-lsf,ras-slurm,ras-tm,rmaps-rank_file,rmaps-topo,rml-ftrm,routed-direct,routed-linear,routed-radix,routed-slave,timer-catamount,timer-aix,timer-altix,timer-solaris,timer-windows
 enable_contrib_no_build=libnbc,vt
 with_memory_manager=no
 with_tm=no
diff --git a/contrib/platform/cisco/ebuild/ludd.conf b/contrib/platform/cisco/ebuild/ludd.conf
index 816b785d41..2293317472 100644
--- a/contrib/platform/cisco/ebuild/ludd.conf
+++ b/contrib/platform/cisco/ebuild/ludd.conf
@@ -54,6 +54,8 @@ opal_set_max_sys_limits = 1
 
 # ORTE behavior
 orte_enable_recovery = 1
+orte_max_local_restarts = 1
+orte_max_global_restarts = 1
 routed = cm
 rmaps = resilient
 orte_create_session_dirs = 0
diff --git a/contrib/platform/cisco/ebuild/native b/contrib/platform/cisco/ebuild/native
index e7e063e6d4..e7627739c3 100644
--- a/contrib/platform/cisco/ebuild/native
+++ b/contrib/platform/cisco/ebuild/native
@@ -23,11 +23,10 @@ enable_per_user_config_files=no
 enable_script_wrapper_compilers=no
 enable_orterun_prefix_by_default=yes
 enable_io_romio=no
-enable_mca_no_build=carto,crs,snapc,crcp,ess-alps,ess-cnos,ess-lsf,ess-portals_utcp,ess-singleton,ess-slave,ess-slurm,ess-slurmd,ess-tm,ess-tool,filem,grpcomm-basic,grpcomm-cnos,grpcomm-hier,notifier-command,notifier-ftb,notifier-smtp,notifier-twitter,plm-alps,plm-ccp,plm-lsf,plm-process,plm-rshd,plm-slurm,plm-submit,plm-tm,plm-xgrid,ras-alps,ras-ccp,ras-gridengine,ras-loadleveler,ras-lsf,ras-slurm,ras-tm,rmaps-rank_file,rmaps-topo,rml-ftrm,routed-direct,routed-linear,routed-radix,routed-slave,timer-catamount,timer-aix,timer-altix,timer-solaris,timer-windows
+enable_mca_no_build=carto,crs,snapc,crcp,paffinity,ess-alps,ess-cnos,ess-lsf,ess-portals_utcp,ess-singleton,ess-slave,ess-slurm,ess-slurmd,ess-tm,ess-tool,filem,grpcomm-basic,grpcomm-cnos,grpcomm-hier,notifier,plm,ras,rmaps-load_balance,rmaps-rank_file,rmaps-round_robin,rmaps-seq,rmaps-topo,rml-ftrm,routed-binomial,routed-direct,routed-linear,routed-radix,routed-slave,timer-catamount,timer-aix,timer-altix,timer-solaris,timer-windows
 enable_contrib_no_build=libnbc,vt
 with_memory_manager=no
 with_tm=no
-with_openib=no
 with_devel_headers=yes
 with_slurm=no
 with_portals=no
diff --git a/contrib/platform/cisco/ebuild/native.conf b/contrib/platform/cisco/ebuild/native.conf
index 816b785d41..2293317472 100644
--- a/contrib/platform/cisco/ebuild/native.conf
+++ b/contrib/platform/cisco/ebuild/native.conf
@@ -54,6 +54,8 @@ opal_set_max_sys_limits = 1
 
 # ORTE behavior
 orte_enable_recovery = 1
+orte_max_local_restarts = 1
+orte_max_global_restarts = 1
 routed = cm
 rmaps = resilient
 orte_create_session_dirs = 0