CLOUDIFY-1705 Fixed checkstyle warnings
Merge remote-tracking branch 'origin/feature/CLOUDIFY-1705' into feature/CLOUDIFY-1705