First fix 47350 introduced a regression found by Noriko.
The following fix fixes the regression identified by Noriko and run
mmr_accept. (4ways still running)
https://fedorahosted.org/389/ticket/47350
https://fedorahosted.org/389/attachment/ticket/47350/0001-Ticket-47350-Co...