[SR-Dev] git:janakj/bdb: Merge commit 'berkeley/trunk' into bdb