Merge branch 'incubaid-1.7' into 1.7-for-1.8

Conflicts:
	src/client/arakoon_remote_client_test.ml
	src/node/mem_store.ml
	src/node/store.ml
	src/plugins/registry.ml