[MOD] Core, locking: various refactorings
Merge branch 'master' of github.com:BaseXdb/basex

Conflicts:
	src/main/java/org/basex/core/cmd/AQuery.java