OCSADV-27 Rename Resource class to the less generic name VoResource #time 5m
Removal of a few raw type warnings