Merge branch 'sockets_devel' of https://github.com/jithinjosepkl/libfabric into connmap-devel
conn_map code.
Merge branch 'miao/connmap-devel' into sockets_devel

Conflicts:
	prov/sockets/src/sock_av.c
	prov/sockets/src/sock_cq.c