EUCA-5646

much cleanup to unify naming of resources in dataholder and eucadata to their plural form