(Bug 48944) RL rearrange resource dependencies

I hope this will solve some of the race conditions, we have seen on
MW 1.22.

Change-Id: I7d26359b3949abc2963cb0afeb55c132a6e9b8d7