A note to indicate you can't run schema commands on the slave
Merge pull request #3346 from mneedham/no-schema-on-slave

A note to indicate you can't run schema commands on the slave
Fixed issue with cancelling long running queries in server.

JsonGenerators were not properly closed in finally blocks which lead to
malformed json when queries were cancelled by the user.
Merge pull request #3385 from pontusmelke/malformed-json

Fixed issue with cancelling long running queries in server.
Merge remote-tracking branch 'upstream/2.0-maint' into 2.1-maint
Merge remote-tracking branch 'upstream/2.1-maint'

Conflicts:
	community/server/pom.xml
	pom.xml