Fix an invalid throw() by removing it.
Implement clear unneeded registers.
Merge branch 'aql2' of ssh://github.com/triAGENS/ArangoDB into aql2

Conflicts:
	lib/Basics/JsonHelper.h