Refactoring: Rename facet constants to distinguish between alalysed and
not analysed facets
Fix FacetEnum references
Add analysed apd facets to FacetEnum
Merge branch 'APD-503-BOZ' into develop