Changes to apply and integrate the combined patches for SOLR-3755 (and it's subtasks)