Drop -SNAPSHOT for release
Merge branch 'release/2.1.5' into stable
Merge branch 'stable'
Promote to 2.1.6-SNAPSHOT