Merge branch 'master' into mm-cluster-devel

Conflicts:
	configure.ac
	src/Makefile.am
	src/apis/c/nanos.h
	src/apis/c/nanos_instrument.cpp
	src/apis/c/nanos_pe.cpp
	src/apis/c/nanos_sync.cpp
	src/apis/c/nanos_wd.cpp
	src/arch/Makefile.am
	src/arch/gpu/gpumemorytransfer.cpp
	src/arch/gpu/gpuprocessor.cpp
	src/arch/gpu/gpuprocessor_decl.hpp
	src/arch/gpu/gputhread.cpp
	src/arch/smp/smpthread.cpp
	src/arch/smp/smpthread.hpp
	src/common.am
	src/core/accelerator.cpp
	src/core/address_fwd.hpp
	src/core/basethread.hpp
	src/core/basethread_decl.hpp
	src/core/commutationdepobj.hpp
	src/core/commutationdepobj_decl.hpp
	src/core/copydata.hpp
	src/core/copydata_decl.hpp
	src/core/dataaccess.hpp
	src/core/dataaccess_decl.hpp
	src/core/dataaccess_fwd.hpp
	src/core/dependableobject.cpp
	src/core/dependableobject.hpp
	src/core/dependableobject_decl.hpp
	src/core/dependableobjectwd.cpp
	src/core/dependableobjectwd_decl.hpp
	src/core/dependenciesdomain.cpp
	src/core/dependenciesdomain.hpp
	src/core/dependenciesdomain_decl.hpp
	src/core/dependency_fwd.hpp
	src/core/instrumentation.cpp
	src/core/instrumentation_decl.hpp
	src/core/nanos-int.h
	src/core/processingelement_decl.hpp
	src/core/regionstatus_decl.hpp
	src/core/schedule.cpp
	src/core/schedule_decl.hpp
	src/core/system.cpp
	src/core/system.hpp
	src/core/system_decl.hpp
	src/core/trackableobject.hpp
	src/core/version_commons.am
	src/core/wddeque_decl.hpp
	src/core/workdescriptor.cpp
	src/core/workdescriptor.hpp
	src/core/workdescriptor_decl.hpp
	src/core/workgroup.cpp
	src/core/workgroup.hpp
	src/plugins/instrumentation/extrae.cpp
	src/plugins/instrumentation/ompi_services.cpp
	src/plugins/sched/affinity-smartpriority_sched.cpp
	src/plugins/sched/default_sched.cpp
	src/support/allocator_decl.hpp
	src/support/atomic.hpp
	src/support/cache.hpp
	src/support/containeradapter.hpp
	src/support/containertraits.hpp
	src/support/simpleallocator.cpp
	src/support/version_commons.am
	src/utils/Makefile.am
	src/utils/nanox.cpp
	tests/test/02_core/copies/test_copy_waiton_dir.c
	tests/test/02_core/deps/test_dependencies.c
	tests/test/02_core/deps/test_dependency_types.c
	tests/test/03_api/c/sort.c