ServerEnvironment: Remove direct dependency on EmergeManager
Merge remote-tracking branch 'minetest/master' into merge2

Conflicts:
	src/emerge.h
	src/environment.cpp
	src/environment.h
	src/map.h
	src/server.cpp