The option to enable (and thus possibly disable) v2.1 was deprecated in Mitaka. It should now be removed. v2.1 is a required part of the API and it was default on. Change-Id: Ia446040e3b4e87438712e7d8c1bafda0a6e53999