SPOI-3304 #comment changes to adhere to API
Merge remote-tracking branch 'origin' into couchbase
contrib/pom.xml