CLOUDIFY-1705 Fixed checkstyle warnings