Merge branch '2.1.x'

Closes gh-17194

Author: wilkinsona

.bomr/bomr.yaml

@@ -8,12 +8,6 @@ bomr:
         - 'type: dependency-upgrade'
     policy: same-major-version
     prohibited:
-      - project: couchbase-client
-        versions:
-          # Jar contains dependencies' classes resulting in duplicates
-          - '[2.7.3]'
-          # Artifacts published as .bundle files rather than .jar files
-          - '[2.7.5]'
       - project: maven-invoker-plugin
         versions:
           # NPE in InstallMojo.installProjectPom (InstallMojo.java:387)