Optimize representations.
Reintroduce ServiceLocatorAwareInterface.
Merge branch 'vocabulary-member' into develop
Merge branch 'develop' into property-selector
Use property term.