Remove merc.application.server_name dependency.
Add feature-specific configuration.
Fix refactoring that didn't get commited before for some reason.