Bug 1091834: updated rsid/rlocalpath script
Merge default -> production