Ups fix branches

2.0.x branch outpaced 2.1 tags and is now wrong. May lead to production ouches.

• Switch to 2.x branch (and drop 2.0.x for now)
• When prod using 2.0.x coughs, switch to tagged release