Remove conflicting dependencies.
Merge pull request #3446 from thobe/2.1-dependencies

Resolve conflicting dependencies.