SOLR-6006: Separate test and compile scope dependencies in the Solrj and Solr contrib ivy.xml files, so that the derived Maven dependencies get filled out properly in the corresponding POMs (merged trunk r1589937, r1589940, and r158953)

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/branch_4x@1589959 13f79535-47bb-0310-9956-ffa450edef68