Wrap docs obtained by a query into CouchDoc documents

Change-Id: If1f80bce76b7b192113bcac9880d6c16d0ca1c82