Change 'csv' -> 'csv-with-metadata-headers' behaviour

Demote a request for the enhanced behaviour if it can't be fulfilled rather than promoting it if it can. This means that callers can still request the simple behaviour if required.

Fix for #1257