CBD-1108:  sync voltron from: git@github.com:couchbase/voltron.git

Change-Id: If3ef44c1e9eadd9cdc9f879e076bfac93c4725b0