[api] Fix support for headers that re-define the 0.1 API version
Merge commit 'ad461e1' into cm-10.2-generic