Fix handling of deprecated boolean value of reply_mode option (#1489052)

Conflicts:

	CHANGELOG