Merge pull request #1593 from apache/couch-server-improvements

Couch server improvements