EN #4386 fix SDK to build without name collisions#67

eneumann merged 3 commits intodeveloppolyapi/polyapi-java:developfrom

EN_#4386_fix-simple-name-collisionspolyapi/polyapi-java:EN_#4386_fix-simple-name-collisionsCopy head branch name to clipboard