Fix address matching in Return-Path header on identity selection (#1489374)

Conflicts:

	CHANGELOG