Prep for 2.1 release
Bump to 2.1.1.beta
Prep for 2.1.1 release
Do not generate a new identifier for a payment when it is re-saved

Fixes #3733