SOLR-5125, SEA-840: Fix build