Bug 825936: Remove reserved slaves support r=rail