Fix-up for param name and leading whitespace in Id158f154

* client_id -> id
* Dedent YAML outputted by ordered_yaml()

Change-Id: I0369e929cf1d41bbca34275f9ab5d4a9e9c61a69