CBD-963:  use rev. 8e906bfbcc3b60cd6a744b96bc2a6f03e307928c

This is the merge point of branch-20 into master.

Change-Id: Ieee0620d4ab4806ff4c32ee5ac29651893b7adf1
Reviewed-on: http://review.couchbase.org/26981
Reviewed-by: Philip Labee <philip@couchbase.com>
Tested-by: Philip Labee <philip@couchbase.com>