Allow queue id as key for OverrideOutgoingMailFrom hash

A queue name is easily changed within the WebUI and maybe the admin forget to
also update the OverrideOutgoingMailFrom setting. It more reliable to use the
queue id instead the queue name as the hash key.
Merge branch '4.2/override-outgoing-mail-from' into 4.2-trunk