Optimized build-nested-set, refs #5667

- Also fixed a syntax error at a throw new sfException
Update link in CONTRIBUTING
Fix some preg_replace_callback calls, fixes #5761
Fix SKOS import process, fixes #5750
Merge branch '1.x' into 2.x

Conflicts:
	plugins/sfSearchPlugin/lib/log/xfLoggerTask.class.php