Added support for version 2.0.x on branch 2-0-stable
change token name to checkout_token
merge in from master for changing token name