We branched gnome-3-20 early to accomodate switching the default
session back to Xorg.

This commit bumps configure 3.21.1 to minimize confusion on
which branch is for what purpose.