apartment subpanel

[bpelectric2010]

you have to excuse me I am out in the field right now and don't have a code book handy however I know the code book pretty well. I think...lol
I have an old apartment building that has underground sub feeders from the main distribution to each apartment. there are no grounds taken to the apartment subpanels. there is however there is a #6 water GEC taken from the water meter in the unit to the panel. how do I treat these panels?
I know that if it was a detached structure that I would drive a ground and treat it as a service and connect the GEC and neutrals altogether in the panel. but this is not a separate structure. One thought is to have all the grounds and neutrals separated and take the water bond GEC to the ground bar.

 

[tortuga]

If they are after the service disconnects they are feeders, if the main distribution is just meters with no breakers they are service conductors. Is the conduit metallic ?

 

[NoahsArc]

connect the GEC and neutrals altogether in the panel.

Is this correct?
If the MBJ is bonded elsewhere, I would not think you should bond grounding and grounded at a fed subpanel. I don't do multifamily services, so I'm not sure. My reading of 250.32.B.1:

Any installed grounded conductor shall not be connected to the EGC or to the GEC.

My understanding is that the separate GEC for detached structures does not mean a bonding point is added other than the GEC-EGC.