remove 2 nocommits, add 1

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene4547@1439721 13f79535-47bb-0310-9956-ffa450edef68
move docValuesType checking down to FieldInfo

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