Bump version to 2.1-SNAPSHOT
Merge pull request #1901 from tinwelint/2.1-pom-updates

Bump version to 2.1-SNAPSHOT