Fix compute resource entity

Make sure that the _factory_data does not override any user provided
field value.
Merge pull request #1467 from elyezer/fix-compute-resource-entity

Fix compute resource entity