Issue #2093405 by japerry: UUIDs for search and events solr pages.
Issue #1971980 by japerry: Add patch to make file so flag exports features correctly