MOSYNC-3212 + code refactoring

MOSYNC-3212 - fixed
+ small code refactoring for property validation
Code reviewer: Ciprian Filipas