remove duplicate (thanks Jeff)

add epoll
cmr=v1.7.3:reviewer=jsquyres

This commit was SVN r29415.

contrib/platform/mellanox/optimized.conf

@@ -57,8 +57,8 @@
 # See "ompi_info --param all all" for a full listing of Open MPI MCA
 # parameters available and their default values.
 coll_fca_enable = 0
+scoll_fca_enable = 0
 rmaps_base_dist_hca = auto
-coll_fca_enable = 0
 coll = ^ml
 hwloc_base_binding_policy = core
 btl = sm,openib,self
@@ -76,3 +76,4 @@ oob_tcp_listen_mode = listen_thread
 oob_tcp_sndbuf = 32768
 oob_tcp_rcvbuf = 32768
 
+opal_event_include=epoll