CLOUDIFY-1444 fix some checkstyle violations