BAP-5548: Refactor extended entity to prevent class name collisions
BAP-5548: Make contact address, email and phone entities extendable
Merge branch 'master' into task/BAP-5548
BAP-5548: Move change log from 1.4 to 1.5
Merge master into task/BAP-5548
Merge pull request #2839 from laboro/task/BAP-5548

BAP-5548: Make contact address, email and phone entities extendable
Merge remote-tracking branch 'remotes/dev/master'