Set master to the equivalent of the 1.21wmf8 deployment branch.

There is a separate feature branch, feature/gettingstartedv2,
branched off before this commit.

Change-Id: I1c0713b9701eeb04abb0acd1ac1801990fa7c68b