Partially implements blueprint mistral-client-2.0 Change-Id: I678f2c005645a83b22ffbf2bfd933bcf22a650bd