SOLR-4549 - Hardening tests after SOLR-4196

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1462495 13f79535-47bb-0310-9956-ffa450edef68
SOLR-4641: Schema should throw exceptoin on illegal field parameters

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