The current claims code doesn't work on v1.1 and v2 because on claims
creation it expects a list rather than a document. This patch fixes this
issue in a backwards compatible way.
Change-Id: I64e824227f148297aba4c27bbd2053d5bab483c5
Closes-bug: #1489863