Merge "Encode header version in api versions" into jb-mr1-dev