Do not ever set the upload path to false, this will only happen if a purl path can not be found for a node, #1177
Merge branch 'SCHOLAR-3-0' of github.com:openscholar/openscholar into SCHOLAR-3-0
Merge branch 'SCHOLAR-3-0' of github.com:openscholar/openscholar into SCHOLAR-3-0
Merge branch 'SCHOLAR-3-0' of github.com:openscholar/openscholar into SCHOLAR-3-0
Limit solr queries to just the current site
Merge branch 'SCHOLAR-3-0' of github.com:openscholar/openscholar into SCHOLAR-3-0