XD-1629 Polishing; Mapped Headers

- add commented props to servers.yml
- add support for mapped headers, with default map all