Incorporating Berkeley DB JE now for NoSQL style DB
Merge remote-tracking branch 'origin/develop' into develop