Merge "(bug 5445) remove autoblocks when user is unblocked"