Backport of fix for MB-11642

This is a minimum implementation of the patch provided
for Sherlock (all configuration methods removed).

Change-Id: I5be0b7247e13d55570d662f2470ffd841a3a7c65
Reviewed-on: http://review.couchbase.org/43047
Reviewed-by: Dave Rigby <daver@couchbase.com>
Reviewed-by: Michael Wiederhold <mike@couchbase.com>
Tested-by: Michael Wiederhold <mike@couchbase.com>