Multiple headers_add/remove options per router/transport - fixes bug 337