Various fixes in documentation and such

* Replace deprecated methods. Bumps version requirement to 1.21.x.

Change-Id: Ie21f205ee31bb621f604f96da633e52611435fcf