Align couchbase more with other data-* support
Revert JDK8 travis change (seem to be failing)