SOLR-1695: revert DocumentBuilder changes from r9112332 and r911228 and improve the existing error messages in UpdateHandler.getIndexedId instead