Drop -SNAPSHOT for release
Merge branch 'release/2.1.6' into stable
Merge branch 'stable'
Bump to 2.1.7-SNAPSHOT