Merge pull request #15573 from bf4/mail_2_6_1_released

Mail 2.6.1 silences excessive warnings; remove Gemfile hack
Conflicts:
	Gemfile