SOLR-6145: In AddSchemaFieldsUpdateProcessor.processAdd(), handle ManagedIndexSchema.addFields() failures that won't benefit from retrying.

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1601775 13f79535-47bb-0310-9956-ffa450edef68
LUCENE-5648: Bug fix for detecting Contains relation when on the edge.

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