Old code cleanup. Sorry
Merge
Merge pull request #36 from ssvsergeyev/develop

Develop
Merge pull request #37 from ssvsergeyev/master

Merge pull request #36 from ssvsergeyev/develop
add code
updated migration script
remove also zproperties
Merge pull request #38 from ssbunyk/develop

Added migration script
Merge pull request #7 from ssvsergeyev/develop

Fix for ZEN-8992