CORE-4922: Added openjdk as a dependency.
Merge remote-tracking branch 'remotes/origin/dev'