MB-9062:  ac6faca63ffc5385fce89a5986430a78961b565b (ns_server)
MB-9017:  8fc645c09d3579512d86c1c9ba45cddc912862a4 (couchdbx-app)

Change-Id: I4566e46c603bc858b31cb105c1472bd19bf60c05
Reviewed-on: http://review.couchbase.org/28812
Reviewed-by: Ravi Mayuram <ravi@couchbase.com>
Reviewed-by: Philip Labee <philip@couchbase.com>
Tested-by: Philip Labee <philip@couchbase.com>