Fix mail lock race condition & Sonar smells#2721

garyrussell merged 3 commits intospring-projects:masterspring-projects/spring-integration:masterfrom

artembilan:sonarartembilan/spring-integration:sonarCopy head branch name to clipboard