Really fix the (shell) escaping for $(tenant_id)s

In some configuration it was expanded as shell variable, so it is
replaced with an empty value (the existing escape mark is not enough)

Change-Id: I9b2125f4b61fdbf7744eff48e3da36c7984379fd