Unifying zipfile distributions

Failsafe integration tests of the zipfiles using ES fail due to an
unrelated problem with runtime ConfigOption validation.