CLOUDIFY-1793 checkstyle fixes