Revert "Revert "upgrade to 6.1.1-SNAPSHOT""

This reverts commit d7c5d8c18325523d16de5720f68f2c7546c990f0.