Switch to a two digit version number, and make the documentation agnostic on
the major version number.

(cherry picked from commit 48c96539)