Fix for SOLR-5418, merge after altering schema produces error

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