VERSION: Increment to 11.22
CHANGE: Faster deletion of halts when unloading a map
FIX: Infinite loop in some cases.
Merge branch '11.x' into 12.x

Conflicts:
	simversion.h
Merge branch '12.x' into devel-new

Conflicts:
	simhalt.cc