FIX Allow 'deleting' service configuration properties and fix broken gateway test