CLOUDIFY-1546 fixed some checkstyle issues