Comment 3 for bug 1286248

I've looked this over and it looks fine, but I'd like someone who uses bricks to check on the brick related portion if possible.

One other minor note, I don't think the comment starting on line 188 really applies any more, since that logic is now in osrf_control.