Cherry picks from 4.1 to 3.4#125

borrrden merged 2 commits into

release/3.4couchbase/couchbase-lite-java-ce:release/3.4from

4.1-3.4_cherry_pickscouchbase/couchbase-lite-java-ce:4.1-3.4_cherry_picksCopy head branch name to clipboard