PLFCLD-53 fix of merge with feature/multitenancy (formatting and merge conflicts removal)