Conflicts:
	configure
	configure.ac
	src/plugins/switch/Makefile.in
	src/plugins/switch/nrt/Makefile.in

Remove tests for xmalloc NULL return
rename adapter name field from "name" to "adapter_name"
Add adapter_type field where needed
Change use of NRT_ADAPTERNAME_LEN to NRT_MAX_DEVICENAME_SIZE

change lid and network_id into arrays and correct field sizes

Change one more ntbl_adapter_resources() to nrt_adapter_resources()
Change ntbl_query_window() to nrt_status_adapter()
add more logging

convert ntbl_unload_window() to nrt_unload_window() and fix some comments and logging

Convert ntbl_status_adapter() use to nrt_status_adapter() and
ntbl_version() to nrt_version() and add logging

Convert ntbl_rdma_jobs() to nrt_rdma_jobs() and add logging

Change ntbl_load_table_rdma() and ntbl_load_table() calls to
nrt_load_table_rdma() and add logging

Convert ntbl_adapter_resources() to nrt_adapter_resource() and
ntbl_clean_window() to nrt_clean_window().
More functions remain and we need to determine adapter_type somehow

change happened and would close up on reservations.

change happened and would close up on blocks.