CBT-1357: Pull voltron from primary git

Change-Id: I0bd3255d094300f0408724c5f13eea01f4d2aa3f
Reviewed-on: http://review.couchbase.org/36021
Tested-by: Chris Hillery <ceej@couchbase.com>
Reviewed-by: Philip Labee <philip@couchbase.com>