Update version to 2.1.0.Final
Revert to 2.2.0-SNAPSHOT