Getting rid of "privilege2" setting. The extra setup:get-appserver-privilege() function is needed, but the admin:appserver-set-privilege2() function is not.
Renaming $xcc-server-settings to $xdbc-server-settings
Issue #220 - fixing broken excluded and included field elements
#164 rlouapre's fix, applied to dev branch instead of master
Merge remote-tracking branch 'upstream/dev' into dev

Conflicts:
	deploy/lib/xquery/setup.xqy