Logging less, and checking if query service is already running.
Merge branch 'master' into replication