Add new enum for EntityFacets
Minor changes on EntityFacetEnum
Merge branch 'DDBNEXT-1408-BOZ' into develop