[GitHub] usergrid pull request #593: Revert "Remove dependency conflicts"

[asfgit]

Github user asfgit closed the pull request at:

    https://github.com/apache/usergrid/pull/593


---