Making berkeley repo setup completely consistent with basic-solr-configs