Merge reason: the rq locking changes are stable,
              propagate them into the .40 queue.
Signed-off-by: NIngo Molnar <mingo@elte.hu>