CORE-4288: Added iplant-clavin as a dependency.
Merge remote-tracking branch 'remotes/origin/dev'