CORE-4288: Added iplant-clavin as a dependency.
CORE-4922: Added openjdk as a dependency.
Merge branch 'dev' of github.com:iPlantCollaborativeOpenSource/iplant-email into dev

Conflicts:
	project.clj