OAK-2094 Oak Upgrade should depend on oak-jcr with a 'test' scope

git-svn-id: https://svn.apache.org/repos/asf/jackrabbit/oak/trunk@1624317 13f79535-47bb-0310-9956-ffa450edef68
Merge remote-tracking branch 'upstream/trunk' into trunk