Bump 2-2-stable to upcoming 2.2.1