EUCA-5646
much cleanup to unify naming of resources in dataholder and eucadata to their plural form
EUCA-5646
missed a couple commas
resolved conflicts
Merge pull request #181 from eucalyptus/EUCA-5646

EUCA-5646