displayName should not be a dependency of displayName.

Otherwise getDisplayName always return existing displayName which is
passed as fields in displayName generator. So once displayName was once
set, it was not changed anymore.
Merge branch 'development' into admin-tools